1040 files changed, 4459 insertions, 4459 deletions

diff --git a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
index c918ca625e..eea2826b3a 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Demo Application Eclipse 3.x
 Bundle-SymbolicName: org.eclipse.emf.ecp.application.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.application3x.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.application3x;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.application3x;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
index 84e6feaea7..cd056d6dcd 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.application.e3</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
index 30608d0b8a..be6d12787f 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP e4 Application
 Bundle-SymbolicName: org.eclipse.emf.ecp.application.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.equinox.event;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.application.e4
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.2.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
index b222d7e2ca..614c648077 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.application.e4</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
index 75e8aa5370..94e14ebabd 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP CDO Model Repository Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.core;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.24.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
+Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.25.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.workspace;bundle-version="[4.1.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.db;bundle-version="[4.1.0,5.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
index 495b1a6134..7b34ba67e0 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.core</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
index 4f30204306..f49f32c509 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Model Repository ECP UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.cdo.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.cdo.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
index db1f004c7b..2c3eb1a16c 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.ui</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
index 10f2eb8393..7595275a67 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker Provider Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.changebroker.provider
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
index 715a55c7a7..6f7e79e6b9 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker.provider</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
index ad763fc5d3..996ee912e4 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.changebroker.spi;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.changebroker.spi;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.changebroker
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
index dac957429e..15f2af1f6d 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
index 2bbb243af7..6e9587b88f 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.common.ui;version="1.24.0",
- org.eclipse.emf.ecp.spi.common.ui.composites;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.common.ui;version="1.25.0",
+ org.eclipse.emf.ecp.spi.common.ui.composites;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.common.ui
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
index a8e76ecf76..1b5c8ab00f 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.common.ui</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
index a091454586..e3c2a056bd 100644
--- a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Common
 Bundle-SymbolicName: org.eclipse.emf.ecp.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.24.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="1.24.0",
- org.eclipse.emf.ecp.common.spi.cachetree;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.25.0",
+ org.eclipse.emf.ecp.common.spi.asserts;version="1.25.0",
+ org.eclipse.emf.ecp.common.spi.cachetree;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.common/pom.xml b/bundles/org.eclipse.emf.ecp.common/pom.xml
index 72febef837..20eeede63f 100644
--- a/bundles/org.eclipse.emf.ecp.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.common</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
index a77dfa5ac2..bd4a1c1745 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Emffilter
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.emffilter;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.core.emffilter.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.core.emffilter
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
index 14bb4a6697..2672f66675 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.emffilter</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
index 6d16be6d09..977cca7d8f 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Sessionprovider
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.servlet.http;version="0.0.0",
- org.eclipse.emf.ecp.core.rap;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core.rap;version="[1.25.0,1.25.1)",
  org.eclipse.rap.rwt;version="0.0.0",
  org.eclipse.rap.rwt.service;version="3.0.2"
 Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
index a061cf72ee..c4b0ac386c 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.rwt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
index 9518adf99b..3f90092b74 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.core.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.core.rap;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
index 7a96da6c4b..3769cfa8ec 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
index 3da86bd73f..a3d3efe842 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.core;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core;version="1.24.0",
- org.eclipse.emf.ecp.core.exceptions;version="1.24.0",
- org.eclipse.emf.ecp.core.util;version="1.24.0",
- org.eclipse.emf.ecp.core.util.observer;version="1.24.0",
- org.eclipse.emf.ecp.internal.core;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.core;version="1.25.0",
+ org.eclipse.emf.ecp.core.exceptions;version="1.25.0",
+ org.eclipse.emf.ecp.core.util;version="1.25.0",
+ org.eclipse.emf.ecp.core.util.observer;version="1.25.0",
+ org.eclipse.emf.ecp.internal.core;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.ui,
    org.eclipse.emf.ecp.ui.view.test,
    org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.internal.core.properties;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.24.0";x-friends:="org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.spi.core;version="1.24.0",
- org.eclipse.emf.ecp.spi.core.util;version="1.24.0"
+ org.eclipse.emf.ecp.internal.core.properties;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.core.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.25.0";x-friends:="org.eclipse.emf.ecp.core.rap",
+ org.eclipse.emf.ecp.spi.core;version="1.25.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
-Import-Package: org.eclipse.emfforms.common;version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
+Import-Package: org.eclipse.emfforms.common;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.core
 Service-Component: OSGI-INF/ecpProviderRegistry.xml,OSGI-INF/ecpRepositoryManager.xml,OSGI-INF/ecpProjectManager.xml,OSGI-INF/ecpObserverBus.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core/pom.xml b/bundles/org.eclipse.emf.ecp.core/pom.xml
index d47781ad23..fc268ae8e9 100644
--- a/bundles/org.eclipse.emf.ecp.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
index 4aa5ab3180..b81f9688bf 100644
--- a/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Diagnostician
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.diagnostician.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ui.validation.test",
- org.eclipse.emf.ecp.internal.diagnostician;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ui.validation.test",
+ org.eclipse.emf.ecp.internal.diagnostician;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
index 6926d7e119..cb9278892b 100644
--- a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.diagnostician</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
index 911219c4f3..4b46de2390 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Diff Merge Context
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.context
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.internal.context.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.diffmerge.spi.context;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.diffmerge.spi.context;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.context
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
index 25044fc984..0fb585ba17 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.context</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
index 78a16d8533..8bf65d2e51 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.spi.diffmerge.model.provider.DiffmergeEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
index 42ae28d7fd..59b5e5b2fa 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.model.edit</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
index 9f57d76413..a60a60b364 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.24.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.25.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.model
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
index fb053e6120..513d74afaa 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.model</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
index ee2ffa9a08..8fc87c864c 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DiffMerge Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.renderer.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
index 1e16f91463..2660f43102 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.renderer.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
index ec5ca12738..11a772cf0a 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DiffMerge UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
+Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
index 735811ec67..ceab03d80d 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
index 89fd515ce7..16ae3c35a9 100644
--- a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Doc
 Bundle-SymbolicName: org.eclipse.emf.ecp.doc;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.doc/pom.xml b/bundles/org.eclipse.emf.ecp.doc/pom.xml
index a25ac2ddcb..be52cb9440 100644
--- a/bundles/org.eclipse.emf.ecp.doc/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.doc/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.doc</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
index fb6145ea7f..7281d33bf3 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECore GenModel Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor.ui;version="1.2.0";x-internal:=true,
  org.eclipse.emf.ecp.ecore.editor.ui.operations;version="1.2.0";x-internal:=true
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.jface.text;bundle-version="[3.8.101,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ecore.editor.ui
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
index cc3cec7ca3..aede392330 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.ui</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
index ddd9b0a543..b74554b6e2 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP ECore Editor
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor;version="1.2.0";x-friends:="org.eclipse.emf.ecp.ecore.editor.test,org.eclipse.emf.ecp.ecore.editor.ui",
  org.eclipse.emf.ecp.ecore.editor.factory;version="1.2.0";x-friends:="org.eclipse.emf.ecp.ecore.editor.test,org.eclipse.emf.ecp.ecore.editor.ui",
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml b/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
index def49fafdf..19fbdc9cec 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
index b87b67b14e..2b88e55938 100644
--- a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Editor controls for Ecore Elements (Deprecated)
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.ecore.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.edit.ecore.swt
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
index 86dfbf9cb6..a33252e08e 100644
--- a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.ecore.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
index 1a087a291b..12f4055737 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.edit.internal.swt.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,org.eclipse.emf.ecp.view.core.swt",
- org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.edit.ecore.swt",
- org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,org.eclipse.emf.ecp.view.core.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.edit.ecore.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.ui.view.swt,
    org.eclipse.emf.ecp.ui.view.editor.controls,
    org.eclipse.emf.ecp.view.table.ui.swt,
    org.eclipse.emf.ecp.view.core.swt",
- org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.24.0";x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.edit.internal.swt.table;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt,org.eclipse.emfforms.swt.control.multiattribute",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="1.24.0";
+ org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.25.0";x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt,org.eclipse.emfforms.swt.control.multiattribute",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.editor,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.view.swt,
@@ -26,27 +26,27 @@ Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.24.0";x-friends
    org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,
    org.eclipse.emf.ecp.view.core.swt,
    org.eclipse.emfforms.swt.control.multiattribute",
- org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.24.0",
- org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.24.0",
- org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.24.0",
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.24.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="1.24.0"
+ org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.25.0",
+ org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.25.0",
+ org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.25.0",
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.25.0",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.fieldassist;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
index 9902816435..0c88ce13ce 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
index 563524cf7b..50c4786a3b 100644
--- a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.edit.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.24.0",
- org.eclipse.emf.ecp.edit.spi.util;version="1.24.0",
- org.eclipse.emf.ecp.internal.edit;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.25.0",
+ org.eclipse.emf.ecp.edit.spi.util;version="1.25.0",
+ org.eclipse.emf.ecp.internal.edit;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
-Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
+Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.2.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.edit
 Service-Component: OSGI-INF/ecpControlFactory.xml,OSGI-INF/org.eclipse.emf.ecp.internal.edit.DeleteServiceFactoryImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.edit/pom.xml b/bundles/org.eclipse.emf.ecp.edit/pom.xml
index 877fdd578f..2cc57cfd83 100644
--- a/bundles/org.eclipse.emf.ecp.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
index 52fe60cca7..9403d265c2 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Editor integration for 3.x Workbench
 Bundle-SymbolicName: org.eclipse.emf.ecp.editor.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.editor.internal.e3.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.24.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.editor.internal.e3;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.25.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.editor.internal.e3;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
index 0724c8d471..09f79f7cb7 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.editor.e3</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
index 5a45408e94..92b46c8607 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web JSON
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.24.0",
- org.eclipse.emf.ecp.emf2web.json.generator.seed.xtend;version="1.24.0",
- org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.24.0",
- org.eclipse.emf.ecp.emf2web.json.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.25.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.seed.xtend;version="1.25.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.25.0",
+ org.eclipse.emf.ecp.emf2web.json.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.xtend.lib.macro;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.json
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
index e05eaf3501..648e35c990 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.emf2web.json</artifactId>
   <packaging>eclipse-plugin</packaging>
   <groupId>org.eclipse.emf.ecp</groupId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
index 2179e59d13..78cfe6af47 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web JSON UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.ui.json;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emf2web.ui.json.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.ui.json;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emf2web.ui.json;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.ui.json
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
index b5096f1902..4aac490df0 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.emf2web.ui.json</artifactId>
   <packaging>eclipse-plugin</packaging>
   <groupId>org.eclipse.emf.ecp</groupId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
index cea68a5dee..386dd3fd4e 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.24.0",
- org.eclipse.emf.ecp.emf2web.ui.messages;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.25.0",
+ org.eclipse.emf.ecp.emf2web.ui.messages;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.5.0,2.0.0)",
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.24.0,1.24.1)",
  org.eclipse.equinox.common;bundle-version="[3.7.0,4.0.0)",
  com.ibm.icu;bundle-version="54.1.0",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
index 244ef3aa26..4cd13cb291 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.emf2web.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
   <groupId>org.eclipse.emf.ecp</groupId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
index 411160a994..5778fe9571 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.emf2web.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.controller.xtend;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.emf2web;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.controller.xtend;version="1.25.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecp.emf2web.exporter,
    org.eclipse.emf.common.util,
    org.eclipse.emf.ecp.view.spi.model",
- org.eclipse.emf.ecp.emf2web.exporter;version="1.24.0";uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecp.emf2web.controller.xtend",
- org.eclipse.emf.ecp.emf2web.generator;version="1.24.0";uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.ecp.emf2web.internal.messages;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.util;version="1.24.0";uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.ecp.emf2web.util.xtend;version="1.24.0"
+ org.eclipse.emf.ecp.emf2web.exporter;version="1.25.0";uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecp.emf2web.controller.xtend",
+ org.eclipse.emf.ecp.emf2web.generator;version="1.25.0";uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.ecp.emf2web.internal.messages;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.util;version="1.25.0";uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.ecp.emf2web.util.xtend;version="1.25.0"
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
@@ -25,26 +25,26 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.25.0,1.25.1)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
index 4324523e60..9088ed1f12 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.emf2web</artifactId>
   <packaging>eclipse-plugin</packaging>
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
index d12cb8ea72..96942c050d 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore Core RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.core.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.rap.rwt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
index de18b85ce2..09a7533149 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.core.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
index 0b70cde996..63ded343a6 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore Provider Core Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.core.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.emfstore.ui.search,
    org.eclipse.emf.ecp.view.ui.editor.test,
@@ -13,10 +13,10 @@ Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.24.0";
    org.eclipse.emf.ecp.emfstore.ui.e4,
    org.eclipse.emf.ecp.emfstore.core.rap"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
-Import-Package: org.eclipse.emfforms.common;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.common;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.core
 Service-Component: OSGI-INF/esWorkspaceProviderProvider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
index 215755b97b..311b76fcb5 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.core</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
index 7825032c0f..7aa66825a0 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore E3
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.e3.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.24.0";x-internal:=true;uses:="org.eclipse.core.commands"
-Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.25.0";x-internal:=true;uses:="org.eclipse.core.commands"
+Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
index 3fa5698f94..3397a2ab71 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.e3</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
index f86fbb2f65..53866cc862 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Emfstore e4 ui
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
  javax.inject;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.swt;bundle-version="[3.100.0,4.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.ui.e4
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
index 5ce6f75dee..472f6f2fd1 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.e4</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
index 01f33c2a3b..c3846d16e9 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Search UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.search;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.ui.search
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
index 382c2ffe38..b5f58a9d88 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.search</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
index 17133cfe6b..ee3b779a2d 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore UI Provider
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.24.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui.e4,org.eclipse.emf.ecp.emfstore.ui.e3",
- org.eclipse.emf.ecp.emfstore.internal.ui.observer;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.25.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui.e4,org.eclipse.emf.ecp.emfstore.ui.e3",
+ org.eclipse.emf.ecp.emfstore.internal.ui.observer;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
index 1ff3d2e0b2..0f460ed678 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
index 82476c8548..f388b822e6 100644
--- a/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Contributions for the Bowling example model
 Bundle-SymbolicName: org.eclipse.emf.ecp.examplemodel.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.examplemodel.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
index 6d531c61e4..d5ff7d76b1 100644
--- a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.examplemodel.ui</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
index 9b5770fcf3..ad43d89743 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Explorer Editor Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.explorereditorbridge;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.explorereditorbridge.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
+Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.editor.e3;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.editor.e3;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.internal.swt;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.internal.swt;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
index 98b0e4f586..9f770812b5 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.explorereditorbridge</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
index f20f452e99..cdf0f3a00c 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,1.8.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.graphiti.integration
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
index 54182ae23a..af6923de60 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Editor to Template Editor Integration
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.templatebridge;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view.templatebridge
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
index 2696d368ac..2b78fcc63b 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.view.templatebridge</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
index a500adc703..6a4f626f23 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE View Editor
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.editor.view.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
- org.eclipse.emf.ecp.ide.editor.view.messages;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
+ org.eclipse.emf.ecp.ide.editor.view.messages;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.ide;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.editor;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.editor;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
index 762f3af187..89977bfc06 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.view</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
index f3e61b2f85..b0d3beaac4 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.viewmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.viewmodel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
index 96d81222b5..bbefae3a0b 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.viewmodel</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
index 37cc099a46..f9c977e64d 100644
--- a/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewModel Migration Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.migration;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.internal.migration.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.internal.migration;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.internal.migration;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.migration
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml b/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
index 6ebe5ee38c..7226e186da 100644
--- a/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.migration</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
index 4946d34e19..f3801524d7 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Ecore Helper Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.internal;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ide.spi.util;version="1.24.0",
- org.eclipse.emf.ecp.internal.ide.util.messages;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.internal;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.spi.util;version="1.25.0",
+ org.eclipse.emf.ecp.internal.ide.util.messages;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.util
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
index a9fc8724d4..340937129e 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.util</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
index 3915c34233..40b97c5bca 100644
--- a/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE ViewModel Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.view.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ide.view.service;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ide.view.service;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.ide.editor.view,
    org.eclipse.emf.ecp.ui.view.editor.controls,
    org.eclipse.emf.ecp.view.model.editor,
    org.eclipse.emf.ecp.view.model.project.installer"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/ideviewmdoelregistry.xml
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml b/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
index 022d683b22..0ebd4a614f 100644
--- a/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.view.service</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
index 106570454d..8f9ce55c45 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Quickfix UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.ui.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.24.0";x-friends:="org.eclipse.emf.ecp.application.e4"
+Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.25.0";x-friends:="org.eclipse.emf.ecp.application.e4"
 Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.0,3.0.0)",
  org.eclipse.e4.ui.di;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.0.2,2.0.0)",
- org.eclipse.emf.ecp.quickfix;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.quickfix;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.7.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
index fc94e23ba5..70a748dc6b 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
index 41765e3290..27101133f0 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Quickfix Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix;version="1.24.0",
- org.eclipse.emf.ecp.quickfix.internal;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.quickfix;version="1.25.0",
+ org.eclipse.emf.ecp.quickfix.internal;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
index 3160e48fc8..abef592af2 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
index 8af958ffa3..6631134a4f 100644
--- a/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RAP Util
 Bundle-SymbolicName: org.eclipse.emf.ecp.rap.util;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.rap.util
 Import-Package: org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.rap.util/pom.xml b/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
index 3758c8e361..e26a1175af 100644
--- a/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.util</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
index 3b581655d3..69f39f949f 100644
--- a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.rap;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.rap;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.rap.ui;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.rap/pom.xml b/bundles/org.eclipse.emf.ecp.rap/pom.xml
index beec687a43..24079e7f72 100644
--- a/bundles/org.eclipse.emf.ecp.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
index 9091ace90a..e62f01655e 100644
--- a/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test Helpers
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.test.common;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.test.common;version="1.25.0"
 Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.test.common/pom.xml b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
index 5fa18714a0..36b63e5b78 100644
--- a/bundles/org.eclipse.emf.ecp.test.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
index f05346826d..447e3dda59 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Eclipse 3.x Integration
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ui.platform.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.commands;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e3;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.linkedView;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.perspective;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.platform;version="1.24.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.ui.tester;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.views;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.commands;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e3;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.linkedView;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.perspective;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.platform;version="1.25.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.ecp.ui.tester;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.views;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.e3
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
index 0a9d0260ca..401a7db43b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.e3</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
index ac88a4532a..5607d8e064 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
@@ -2,34 +2,34 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP E4 UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ui.internal.e4.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.24.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.handlers;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e4.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.view;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.internal.e4;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.25.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.handlers;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e4.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.view;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.internal.e4;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.ui.workbench.swt;bundle-version="[0.10.0,1.0.0)",
  javax.inject;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.ui.di;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.annotation;version="1.1.0",
  javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.service.event;version="1.3.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.e4
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
index 9fbf70e47e..6695b0dc81 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.e4</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
index 9bae24521f..bdb0e1ec9b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI RWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.rap.filedialog;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rap.rwt;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
index 60527e45d4..4e79b6d723 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
index 9427e65836..e82c71e06c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rcp
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.swt;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
index 1c3096ddb4..6f8f10ed1f 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.rcp</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
index a372fb7f13..5ec2c2e2a8 100644
--- a/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Transactional UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.transaction;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.transaction
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
index 339062cf3f..abdfe31d3f 100644
--- a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.transaction</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
index 788c488800..3752a65e89 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI Validation E4
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.validation.e4.view;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.validation.e4.view;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.e4.ui.workbench.swt;bundle-version="[0.10.0,1.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.ui.di;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[0.1.0,2.0.0)",
  org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,3.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
index f7c84b056d..672b1e3576 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.validation.e4</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
index def20c99ed..8095f68fa4 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.ui.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ide.migration",
- org.eclipse.emf.ecp.ui.validation;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
+Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ide.migration",
+ org.eclipse.emf.ecp.ui.validation;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
index a12e3ca0ce..c1a4fcde8a 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.validation</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
index a2beee3702..d59fb11058 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Legacy View Model Editor Controls
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.legacy;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.handler;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.handler;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.legacy
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
index 0f824e5467..c08d5a8a30 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
index cdce6de9ba..96d5ffae49 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
@@ -2,55 +2,55 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Controls
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.editor.controls.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.24.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emfforms.ide.view.mappingsegment,org.eclipse.emf.ecp.view.template.tooling",
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.25.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emfforms.ide.view.mappingsegment,org.eclipse.emf.ecp.view.template.tooling",
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.view.model.project.installer,
    org.eclipse.emf.ecp.view.model.editor,
    org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,
    org.eclipse.emfforms.ide.view.multisegment,
    org.eclipse.emf.ecp.view.template.tooling",
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.24.0"
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
index 130366c14d..bfe5284c05 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
index 281c28d9dc..35aae0c2e6 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP String Modifier with Line Wrapping
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.linewrapper
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
index 56e7bd344f..bf40e5b404 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
index 06460833a5..ef6ae87cb4 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dependency Injection SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.di;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.1,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.di
-Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.swt.graphics;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="1.8.0"
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
index 6888a5c3d5..fcd6a889a5 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
index 5cf01041de..44fb1d6c6d 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.swt.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.24.0",
- org.eclipse.emf.ecp.ui.view.swt.reference;version="1.24.0",
- org.eclipse.emf.ecp.view.internal.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test,org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.spi.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.swt.layout;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.swt.masterdetail;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.swt.selection;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.swt.services;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.25.0",
+ org.eclipse.emf.ecp.ui.view.swt.reference;version="1.25.0",
+ org.eclipse.emf.ecp.view.internal.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.swt.layout;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.swt.masterdetail;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.swt.selection;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.swt.services;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.spi.view.template.service;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.label.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.emfforms.spi.view.annotation.model;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.spi.view.template.service;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.label.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.emfforms.spi.view.annotation.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.eclipse.jface;version="0.0.0",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
index 12a71642ce..4d305876d0 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
index d2ee0fb058..85073b8634 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MPI UI View
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view;version="1.24.0",
- org.eclipse.emf.ecp.view.internal.provider;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.internal.ui;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.spi.provider;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.renderer;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.ui.view;version="1.25.0",
+ org.eclipse.emf.ecp.view.internal.provider;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.internal.ui;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.spi.provider;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.renderer;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view
 Service-Component: OSGI-INF/EMFFormsViewService.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
index c70a6f846f..2dd5bfd7d6 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index 9a1bf220a8..07c3c2ef4c 100644
--- a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.ui.rcp",
- org.eclipse.emf.ecp.internal.ui.composites;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.24.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.internal.ui.model;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.e4,org.eclipse.emf.ecp.ui.e3,org.eclipse.emf.ecp.ui.transaction",
- org.eclipse.emf.ecp.internal.ui.tester;version="1.24.0",
- org.eclipse.emf.ecp.internal.ui.util;version="1.24.0";
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.25.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.e4,org.eclipse.emf.ecp.ui.e3,org.eclipse.emf.ecp.ui.transaction",
+ org.eclipse.emf.ecp.internal.ui.tester;version="1.25.0",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.e3,
    org.eclipse.emf.ecp.ui.e4,
@@ -22,17 +22,17 @@ Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.24.0";
    org.eclipse.emf.ecp.validationvieweditorbridge,
    org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.ui.rcp",
- org.eclipse.emf.ecp.internal.wizards;version="1.24.0";
+ org.eclipse.emf.ecp.internal.wizards;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.workspace.ui,
    org.eclipse.emf.ecp.view.table.editor,
    org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.internal.wizards.page;version="1.24.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.spi.ui;version="1.24.0",
- org.eclipse.emf.ecp.spi.ui.util;version="1.24.0",
- org.eclipse.emf.ecp.ui;version="1.24.0",
- org.eclipse.emf.ecp.ui.common;version="1.24.0";
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.25.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.spi.ui;version="1.25.0",
+ org.eclipse.emf.ecp.spi.ui.util;version="1.25.0",
+ org.eclipse.emf.ecp.ui;version="1.25.0",
+ org.eclipse.emf.ecp.ui.common;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.e3,
@@ -40,15 +40,15 @@ Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.24.0";
    org.eclipse.emf.ecp.view.ui.editor.test,
    org.eclipse.emf.ecp.workspace.ui,
    org.eclipse.emf.ecp.ui.e4",
- org.eclipse.emf.ecp.ui.common.dnd;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ui.util;version="1.24.0"
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ui.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ui/pom.xml
index 90d1d1eba5..0d85f801b6 100644
--- a/bundles/org.eclipse.emf.ecp.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
index 09a48bffca..84b19c132c 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation Connector Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.connector;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.validation.connector.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
index 056ee5cf9c..2ffcdabfbc 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.connector</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
index 07687d33a6..88c8e7f79e 100644
--- a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.api;version="1.24.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
+Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.api;version="1.25.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.validation
 Service-Component: OSGI-INF/validationService.xml
diff --git a/bundles/org.eclipse.emf.ecp.validation/pom.xml b/bundles/org.eclipse.emf.ecp.validation/pom.xml
index d7eb679698..2c65f2776e 100644
--- a/bundles/org.eclipse.emf.ecp.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
index 207c854f8b..83b957ef7d 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View to Editor Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.validationvieweditorbridge;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.validationvieweditorbridge
 Import-Package: org.eclipse.jface.viewers;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
index 16ece72704..1641698345 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validationvieweditorbridge</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
index 5050f5fcf7..654438543e 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.categorization.model.provider.CategorizationEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
index b2b0086921..127c54059a 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
index 5eda190973..87b7f51a7a 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.model
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
index 893582282d..6bd16339cc 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
index 854d4a4963..3eefeebd27 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Categorization SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.categorization.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
index 1f756d95e4..5c96463483 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
index 643e66ce25..1e6c5d8aec 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider.HorizontalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
index 692b1bf3c9..125cd46fcc 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
index 4a44156ab2..4b0b4d3744 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.model
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
index e05e34cfbc..a38b88a883 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
index 54811d5ec5..a184441566 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/CompoundControlDIRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
index 21919c7d34..05a12cc032 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
index be6c214074..e85fd9e891 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
index 954fdcebb9..8a71bbd4a8 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
index e90368c01a..35177847fa 100644
--- a/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Locale View Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.locale;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.context.locale
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml b/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
index bc21f75395..f5a95d4fbc 100644
--- a/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.context.locale</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
index ee702eec92..118f017135 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Context
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.context;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.context;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/viewModelContextCF.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)";resolution:=optional,
- org.eclipse.emfforms.common;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.view.context
diff --git a/bundles/org.eclipse.emf.ecp.view.context/pom.xml b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
index 9159a68dc7..d99ffd1fe9 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
index b5d7242b42..4ffa7b3d2b 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multireference
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.24.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.25.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emf.ecp.ui.view.editor.controls"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/multiReferenceRendererService.xml,OSGI-INF/LinkOnlyMultiReferenceRendererService.xml,OSGI-INF/multiReferenceRevealProvider.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.internal.core.services.label;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.internal.core.services.label;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml b/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
index 757e05d81f..5fecf9deb8 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
index 35ad159014..ac2ccd01e3 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
@@ -2,35 +2,35 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Core SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.core.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.spi.core.swt;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.25.0";
   uses:="org.eclipse.emf.ecp.ui.view.swt.internal,
    org.eclipse.emf.ecp.view.spi.model,
    org.eclipse.swt.widgets,
    org.eclipse.emf.ecp.view.spi.context,
    org.eclipse.emf.ecp.edit.spi.swt.util",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.24.0"
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
index 553a0fe595..f38b232ef1 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
index 6a0dbcd7c6..9eba0a39f9 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.custom.model.provider.CustomEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
index 2142270313..b4fabd878b 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
index 60d5502df0..dfd3c2ebf3 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.custom.model.impl.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
 Import-Package: org.eclipse.core.databinding.property.list;version="0.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common.spi;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.model
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
index 6f881c9897..6bf57e45be 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index 09661dee3c..b784f02eb8 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom View SWT DI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.di;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.di
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.swt.widgets;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
index 8940035419..5868a2d259 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
index 89728fcfd2..31d53eea95 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom View SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.custom.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
- org.eclipse.emf.ecp.view.spi.custom.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.custom.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
index f451008846..bb57aa26cf 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
index 93a4333fee..8dec735fac 100644
--- a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.edapt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edapt.history;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.edapt
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
index e7043d2104..75570b8f14 100644
--- a/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.edapt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
index 0447a129b7..051ef740cd 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.group.model.provider.GroupEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.group.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
index acd6baea65..bc999ef054 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
index 1e1cfe66e3..e8be5511c7 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.group.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.group.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.group.model
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
index c966932311..a81521d860 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
index 0f13f833a3..fa501422c9 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Collapsable Group
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsable
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.3.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/collapsableGroupRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
index 27c97afe9e..2ad2e112e0 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
index c52895d067..bbe7f9d92c 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Collapsible Group Renderer using PGroup
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/pGroupRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.nebula.widgets.pgroup;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
index c00b896828..8b564092e9 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
index 03c29949e8..533370e4c2 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AlignmentGroup SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.embedded
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/embeddedGroupRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
index 78599e8b67..5abaf8ef24 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
index 08716bef72..2d94d4af51 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Group UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.24.0",
- org.eclipse.emfforms.internal.group.swt;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.25.0",
+ org.eclipse.emfforms.internal.group.swt;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/groupRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
index bd672e393b..e6ed130278 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
index 4d593951dd..796491ba81 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider.GroupedGridEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.groupedgrid.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
index 4ab89d7ee2..13ddd0ce08 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
index 0f2970020e..0ae2f5c4c5 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.groupedgrid.model
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
index 775d184c42..d297814709 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
index dd27c87b6e..d61d9aafd8 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Grouped Grid UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/GroupedGridSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
index 1523665cb8..80d4b11589 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
index 7f6616e0f5..92bae5d771 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.horizontal.model.provider.HorizontalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
index 41e5ddac36..1039f921f1 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.horizontal.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
index f16b4ff6f0..d18030a336 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Horizontal View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.model
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
index a2cda5acf7..78bb136be5 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.horizontal.model</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
index a09b4dffe5..b06654bac3 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Horizontal UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/horizontalLayoutRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.internal.core.swt;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.internal.core.swt;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
index af20c352ec..c5952eacc5 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
index 31eaa17fbf..85dfea3559 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider.IndexdmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
index 8978c86445..2a6cbe0122 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
index eb9ea1e8b2..fd028b7118 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
index 84bea0db3a..bef8639851 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
index 3e4e624b55..49301a3eaf 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Index DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/PrefixDmrDomainModelReferenceRendererService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
index 7b6b3d1e67..e2e4ea9593 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
index 19834d712e..5effb868e0 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider.KeyattributedmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
index cce0a8987c..fd747694c0 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
index f1e1ae7f37..9e6be114e5 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
index 5114b9d405..c39bf6591c 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
index f1dd51045c..6e4fc6825b 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Key Attribute DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/KeyValueControlRendererService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
index fbaea2a0c9..ca56e18fca 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
index 43bd8bfeae..d2bbeaca20 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.label.model.provider.LabelEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.label.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
index 36cd3f43a6..e13ae1270b 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
index ed5489a1e8..9e6291b096 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.label.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.label.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.label.model
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
index b9a72a31e9..ff01d02d24 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.model</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
index b1be4acb75..45095346f8 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Label Rap
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/labelRAPRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.25.0,1.25.1)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.label.rap
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
index 41074f9e32..c368d926fa 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.rap</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
index 4696e30bdc..bf46ed83c8 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Label UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.ui.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.label.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.label.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/labelRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
index d9813ae0d8..66d01435c9 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
index 57b40ba31d..fd55acfe45 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider.MappingdmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
index da8b1ed8c4..62e1b91a57 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
index 7e90f0445f..d659a65f77 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
index 47fa994b6b..71b20d26d3 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
index 89acfea982..93ac4f0981 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.tooling
-Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.viewers;version="0.0.0",
  org.eclipse.jface.window;version="0.0.0",
  org.eclipse.jface.wizard;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
index eb8818c5d3..f908524f53 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
index fc7ca31e58..106038a8fc 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Migrator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.24.0",
- org.eclipse.emf.ecp.spi.view.migrator.string;version="1.24.0",
- org.eclipse.emf.ecp.view.migrator;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.25.0",
+ org.eclipse.emf.ecp.spi.view.migrator.string;version="1.25.0",
+ org.eclipse.emf.ecp.view.migrator;version="1.25.0"
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
index e97054b1da..78c6e9896c 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.migrator</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
index cbad8a88cb..d6c4b23faa 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common View Model Classes for Dependency Injection
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.di;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common.di.annotations;version="1.24.0",
- org.eclipse.emf.ecp.view.model.common.di.messages;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.common.di;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.model.common.di.annotations;version="1.25.0",
+ org.eclipse.emf.ecp.view.model.common.di.messages;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.common.di;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,1.9.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/viewServiceSupplier.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
index 594dfa24b5..3ef61e48db 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
index f44e56c6ac..dfdf6f420f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common View Model Classes
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.24.0",
- org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.24.0",
- org.eclipse.emf.ecp.view.model.common.util;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.common.callback;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.25.0",
+ org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.25.0",
+ org.eclipse.emf.ecp.view.model.common.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.common.callback;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
index cc68d18e0f..c1d88fe3ae 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
index 49ef7b3c3c..fa495ff6e5 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt Migration for Core View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edapt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.edapt
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
index e753d9014c..403309a3e7 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.edapt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
index a3ebb71691..45ecad21a9 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
index 4b99b50b99..c57f824775 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
index 16a0469a82..bc9285965d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: New View Model Project Wizard
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.project.installer;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.internal.project.installer.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.project.installer
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
index 88bef9d6ea..6722e8ef0d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.project.installer</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
index b6520892ce..af8fe26b4b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.model.presentation.ViewEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.presentation;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer",
- org.eclipse.emf.ecp.view.model.refactoring;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.presentation;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer",
+ org.eclipse.emf.ecp.view.model.refactoring;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
index 0d518f0961..d292cec472 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
index 8afece02fc..b15b4bd0cb 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.generator
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
index 52bce7c59c..be78bb8693 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
index 605a929ca1..a260e5a459 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Preview Common
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.preview.common.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.preview.common;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3,org.eclipse.emf.ecp.view.model.preview.e4"
+Export-Package: org.eclipse.emf.ecp.view.model.preview.common;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3,org.eclipse.emf.ecp.view.model.preview.e4"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
 Import-Package: org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.ui.view.swt;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)",
  org.eclipse.jface;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
index f58179136d..98d6306041 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.preview.common</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
index d9b39e2de2..af6a4105fb 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Preview View
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.internal.preview.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.24.0,1.24.1)";resolution:=optional,
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)";resolution:=optional
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.25.0,1.25.1)";resolution:=optional,
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
index 6f362e9463..16ef377a96 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.preview.e3</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
index d7c7cda83c..c3be474345 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XMI View Model Provider
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.model.provider.xmi.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.xmi
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
index 4749dabb0c..966f7bc37f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
index cd3e890dd2..1fc14f74bc 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.model.impl.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.model.reporting;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.model.reporting;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
diff --git a/bundles/org.eclipse.emf.ecp.view.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
index 46d7ad589b..9c14913c5d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
index 1f8b5d27b8..ed1071abb0 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Model Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.rule.model.provider.RuleEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
index a9f38f833e..cd84635a67 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
index bd3a5e156a..b53966d3e6 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.rule.model.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)"
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
index 8593e9ab0c..8ee97b7e8e 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
index d806f64e68..91c8152b9e 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.rule.test,org.eclipse.emf.ecp.view.model.integrationtest,org.eclipse.emf.ecp.view.unset.test",
- org.eclipse.emf.ecp.view.spi.rule;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.rule.test,org.eclipse.emf.ecp.view.model.integrationtest,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,
  OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,
@@ -25,7 +25,7 @@ Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionSe
  OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.TrueConditionService.xml,
  OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.IsProxyConditionService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.2.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
index 7d92036218..9c8509d920 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   

diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
index 1a35d4614f..ce95740958 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.section.model.provider.SectionEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.section.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
index 379abfa9ea..de6e3487bd 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
index dea3dd3cd6..e7dac8cf7e 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.section.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.section.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.section.model
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
index 374e6982ee..5a9725a3b2 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
index ea908e4de5..d1f73f5436 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Section UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.section.ui.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.section.swt;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.section.swt;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)"
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
index 49db5c4efa..fb3166f87c 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
index 33099f2180..a788d6eb6a 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.stack.model.provider.StackEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.emf.ecp.view.spi.stack.model.provider;version="0.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
index dc14787e2d..ecae87ef7b 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
index c2038c6980..46c84b56b5 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@ Export-Package: org.eclipse.emf.ecp.view.spi.stack.model;version="0.1.0",
  org.eclipse.emf.ecp.view.spi.stack.model.util;version="0.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.model
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
index b0f54a1356..03df5c1e0f 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
index 8660e72abf..9d5dde2115 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.stack.ui.swt.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.ui.swt
 Service-Component: OSGI-INF/SWTStackLayoutRendererService.xml,OSGI-INF/stackItemRendererService.xml
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.custom;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
index 8ab5f653fe..e13c1d730f 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
index f17fce3ea7..fceaad4246 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Stack Layout Viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.viewmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.viewmodel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
index ea8c7653dd..7408c8beee 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
index 2ff905a69a..4fe4532e4b 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default LayoutProvider
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.swt.layout;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml b/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
index 7024ff5b6a..c526f7ae2e 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.swt.layout</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
index 54a597b93f..8e24757413 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT Additional Cell Editors for Non-RAP Applications
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.celleditor.rcp;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.celleditor.rcp
diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
index 4ab7376477..c32022200e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.celleditor.rcp</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
index 0393336faf..2c6ac1f3be 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP View Table Column Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.columnservice;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.columnservice.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.columnservice
diff --git a/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
index 2494f32742..27c0f2ca3e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.columnservice</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
index bb31ec61e5..7068f1c123 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt Migration for Table View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.edapt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.edapt
diff --git a/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
index 1ad63aaae9..c4c300bd13 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.edapt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
index a613d3dcde..545f16f988 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.table.model.provider.TableEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
index 9c938d20ce..da0f7d192b 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
index 5685c86643..ba69dcd24b 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.model.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.table.columnservice,org.eclipse.emf.ecp.view.table.editor",
- org.eclipse.emf.ecp.view.internal.table.model;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.table.columnservice,org.eclipse.emf.ecp.view.table.editor",
+ org.eclipse.emf.ecp.view.internal.table.model;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.2.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.model
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
index 9032896d6a..184b70c78e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
index 38081c3a0b..463f4d8668 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Grid Table Rap
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.nebula.grid.rap;version="1.17.0";x-internal:=true,
  org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap;version="1.17.0",
  org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.menu;version="1.17.0",
  org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.messages;version="1.17.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.nebula.widgets.grid;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/RAPGridControlSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.editsupport;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.editsupport;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
index fd700fc529..8c07886f30 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
index 13eedf3a7b..5cf57d074c 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
@@ -2,38 +2,38 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Nebula Grid Table UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.menu;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.menu;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
index 8b2c1e042c..76939fef2a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
index 006f466405..f91ff3ff02 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI RCP
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.rcp
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.25.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/TableControlRCPRendererService.xml,OSGI-INF/TableControlDetailDialogRCPRendererService.xml,OSGI-INF/TableControlDetailPanelRCPRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.rcp
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
index 225387fb5b..5f7d267a63 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.ui.rcp</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
index 9aa616a081..640d1206a8 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT Service for Persisting State
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.persistedstate
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)"
 Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.persistedstate
 Service-Component: OSGI-INF/PersistTableStateServiceFactory.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
index 353cb41d9b..e8f189ed0e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt.persistedstate</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
index f74ce14df2..c5c430f16a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test,org.eclipse.emf.ecp.view.table.ui.swt.test",
- org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test,org.eclipse.emf.ecp.view.table.ui.swt.test",
+ org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.eclipse.jface.bindings.keys;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
index 6d531ad06e..69cc3ccf65 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
index ac547186d4..c18b41dc56 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Table Detail Validation (Legacy)
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.validation
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
index 3cc509da72..40297280f6 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.validation</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
index d75e6a69d0..e9d3c6c944 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.annotation.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider.AnnotationSelectorEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.annotation.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
index 029e821374..bf55833bc7 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.template.annotation.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
index 3830e1bc98..a863eb30a5 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.annotation.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.annotation.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.annotation.model
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
index adc88ce5aa..a481f3b0e2 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.template.annotation.model</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
index bda7713462..c1d2232af4 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
@@ -2,37 +2,37 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.template.model.provider.TemplateEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit",
- org.eclipse.emf.ecp.view.template.selector.bool.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.keybinding.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.bool.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
index e635e0896a..56ca94c5a4 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
index 61f57c9180..8ff0bf52d0 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
@@ -2,77 +2,77 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.template.model.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit,org.eclipse.emf.ecp.view.template.annotation.model.edit",
- org.eclipse.emf.ecp.view.template.selector.bool.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.bool.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.background.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.keybinding.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.keybinding.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.keybinding.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.labelwidth.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.reference.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tab.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.unsettable.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.wrap.model;version="1.24.0",
- org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
+Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit,org.eclipse.emf.ecp.view.template.annotation.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.bool.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.bool.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.background.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.keybinding.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.reference.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tab.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.unsettable.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.wrap.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
index 2d6a389580..c0a5049a49 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
index 017c2a795e..310252f579 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewTemplate Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.template.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.24.0",
- org.eclipse.emf.ecp.view.template.service;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.service;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)"
 Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service
 Service-Component: OSGI-INF/viewTemplate.xml,OSGI-INF/ViewTemplateSupplierImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
index 4ec529b791..3e6f7f74e4 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.service</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <properties>

   	<jacoco.percentage.instruction>0.1</jacoco.percentage.instruction>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
index 998427193c..eac0ac61ca 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Template Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.template.internal.tooling.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.editor;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.editor;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.100.0,4.0.0)",
@@ -18,29 +18,29 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.swt.typed;version="0.0.0",
  org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
index acd669249d..ecde65fabc 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
index f21d992a9a..b3187d0c70 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.treemasterdetail.model.provider.TreeMasterDetailEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
index 58ddb68d66..8b4ba72fe8 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model.edit</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
index 4bbeebf864..2e1a5f781f 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.view.treemasterdetail.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.treemasterdetail.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.model
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
index 034034d65e..efa1fc02cb 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
index 8848812889..390de5791a 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Vertical UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.24.0";x-internal:=true,
- org.eclipse.emf.edit.ui.action.ecp;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.edit.ui.action.ecp;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
index 74adb17c21..ae6b91f0f4 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
index c3109c5bd3..e34ffe37cc 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms TreeMasterDetail Services
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.validation
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.eclipse.jface.viewers;version="0.0.0",
  org.eclipse.ui.views.properties;version="0.0.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
index cfa053ed72..0b23a54ff3 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
index 29e5927cd8..f564393d41 100644
--- a/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Unset Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.unset
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.unset/pom.xml b/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
index 6639b413a1..a53a115069 100644
--- a/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.unset</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
index f0e73e507f..0e7e9431f7 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Util RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt.rap
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.rwt;bundle-version="[3.1.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.RAPImageRegistryService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="[1.25.0,1.25.1)",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
  org.osgi.framework;version="1.3.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
index 7b0cdc1e80..640be74d5c 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.util.swt.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
index 51bec2cd34..2f0b180d4c 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Util
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.util.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.util.swt;version="1.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.util.swt
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
index 7153ba465f..dc527457f7 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.util.swt</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
index a6954c5fc6..16b413a583 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Bean Validation
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.default;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.bean.default
 Import-Package: javax.validation;version="[1.0.0,2.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
index 74b73b2763..abba92794e 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
index cd58c6f094..8ae630fec2 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms BeanValidation
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.bean.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.validation;version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
index 6bfab742d4..5ada2e45d7 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
index bafc5a4a43..d53415b1db 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Validation Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.25.0";
   x-friends:="org.eclipse.emf.ecp.view.table.ui,
    org.eclipse.emf.ecp.view.custom.ui,
    org.eclipse.emf.ecp.edit.swt,
    org.eclipse.emf.ecp.test.model",
- org.eclipse.emf.ecp.view.spi.validation;version="1.24.0"
+ org.eclipse.emf.ecp.view.spi.validation;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
index e1578790ae..2a568dd3c8 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.view.validation</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
index e04ed8f80b..d354a5c021 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.vertical.model.provider.VerticalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
index a41aa2881a..a3f6e20868 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.vertical.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
index 3f3c1d7c77..744ef04bdf 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.model
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
index 424f4e21c4..fd8da3f150 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.vertical.model</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
index a92f9720da..9720005f39 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Vertical UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/verticalLayoutRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
index 42e3d6f2e6..4dc922ccbe 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
index e857dec404..d5a1dd0ede 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider.ViewproxyEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
index 73e1b912ea..495f697446 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
index 5cc79c3e63..d63dde5ffb 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.model
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
index 6726f8d2e0..348e265ab2 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
index be8cbaeb02..8f9a8e2933 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewModel Workspace Migrator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.workspace.migrator;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.workspace.migrator
 Service-Component: OSGI-INF/workspaceMigrator.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
index 9227f694cd..74407bfdc4 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.workspace.migrator</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
index 1bf758e1da..f862cc5c82 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Workspace Integration Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.core;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.24.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.25.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
index f40b231cd5..16d04842bb 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.workspace.core</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
index 73b7f9246f..d94878470e 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Workspace Integration UI RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui.rap;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.filedialog;bundle-version="[3.1.2,4.0.0)",
  org.eclipse.rap.rwt;bundle-version="[3.1.2,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
index 98cd241b35..5be9accbf6 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.workspace.ui.rap</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
index abd8ebcc2d..bcb57243c9 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Workspace Integration UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
index c54f5a6754..3ff0bf3b39 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.workspace.ui</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
index 222fe98e3d..f594ab40a2 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Minimal RAP EMF Edit UI
 Bundle-SymbolicName: org.eclipse.emf.rap.edit.ui.minimal
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.edit.ui.provider.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.edit.ui.dnd;version="2.10.0",
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
index 6724c98b12..912f4f2dd5 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.rap.edit.ui.minimal</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
index cf832cead0..bb33d1ae24 100644
--- a/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Pre-Set Validation
 Bundle-SymbolicName: org.eclipse.emfforms.common.prevalidation
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.common.prevalidation;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.common.prevalidation;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/PreSetValidationServiceImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
index ff43a23c6d..83677356be 100644
--- a/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.common.prevalidation</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
index 60cd794e27..19a2e55020 100644
--- a/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Validation
 Bundle-SymbolicName: org.eclipse.emfforms.common.validation;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.24.0";x-friends:="org.eclipse.emf.ecp.ide.migration,org.eclipse.emf.ecp.view.validation,org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emfforms.common.spi.validation;version="1.24.0",
- org.eclipse.emfforms.common.spi.validation.exception;version="1.24.0",
- org.eclipse.emfforms.common.spi.validation.filter;version="1.24.0"
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.25.0";x-friends:="org.eclipse.emf.ecp.ide.migration,org.eclipse.emf.ecp.view.validation,org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emfforms.common.spi.validation;version="1.25.0",
+ org.eclipse.emfforms.common.spi.validation.exception;version="1.25.0",
+ org.eclipse.emfforms.common.spi.validation.filter;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.common.validation
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.common.validation/pom.xml b/bundles/org.eclipse.emfforms.common.validation/pom.xml
index c1325912aa..80c1fe28fa 100644
--- a/bundles/org.eclipse.emfforms.common.validation/pom.xml
+++ b/bundles/org.eclipse.emfforms.common.validation/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.common.validation</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
index 229532970e..bc7fd1ea9c 100644
--- a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Common
 Bundle-SymbolicName: org.eclipse.emfforms.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common;version="1.24.0",
- org.eclipse.emfforms.internal.common;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.converter;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.report;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.common;version="1.24.0",
- org.eclipse.emfforms.spi.common.converter;version="1.24.0",
- org.eclipse.emfforms.spi.common.locale;version="1.24.0",
- org.eclipse.emfforms.spi.common.report;version="1.24.0",
- org.eclipse.emfforms.spi.common.sort;version="1.24.0",
- org.eclipse.emfforms.spi.common.validation;version="1.24.0"
+Export-Package: org.eclipse.emfforms.common;version="1.25.0",
+ org.eclipse.emfforms.internal.common;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.converter;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.report;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common;version="1.25.0",
+ org.eclipse.emfforms.spi.common.converter;version="1.25.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.25.0",
+ org.eclipse.emfforms.spi.common.report;version="1.25.0",
+ org.eclipse.emfforms.spi.common.sort;version="1.25.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.common/pom.xml b/bundles/org.eclipse.emfforms.common/pom.xml
index 04dc74cbac..dfa264fce3 100644
--- a/bundles/org.eclipse.emfforms.common/pom.xml
+++ b/bundles/org.eclipse.emfforms.common/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.common</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
index 7abef4e74a..7ebaa5608d 100644
--- a/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Bazaar
 Bundle-SymbolicName: org.eclipse.emfforms.core.bazaar
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.bazaar;version="1.24.0",
- org.eclipse.emfforms.bazaar.internal;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.bazaar;version="1.24.0"
+Export-Package: org.eclipse.emfforms.bazaar;version="1.25.0",
+ org.eclipse.emfforms.bazaar.internal;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.bazaar;version="1.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.bazaar
 Import-Package: javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.emfforms.core.bazaar/pom.xml b/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
index a3c4f47ccc..f049f57bcd 100644
--- a/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.bazaar</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
index 6ba4bf7d3f..6f93489865 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Featurepath Databinding Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/featurePathDomainModelReferenceConverterService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.featurepath
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
index e690ba5ddc..ea56c490cd 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
index 302e162e92..382ebbdab0 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/indexDomainModelReferenceConverter.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
index 8e5952ea93..23b3843a31 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
index 8b47227029..10274428ff 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Keyattribute DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/KeyAttributeDomainModelReferenceConverter.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
index 53aa6c2d46..7368eb713b 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
index b12e1662cc..2179085288 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/mappingDomainModelReferenceConverter.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
index abf22941b1..6a764a8afd 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
index 3dc36c5af0..677292166c 100644
--- a/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms DataTemplate Service
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.datatemplate;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.datatemplate;version="1.24.0",
- org.eclipse.emfforms.internal.core.services.datatemplate;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.datatemplate;version="1.25.0",
+ org.eclipse.emfforms.internal.core.services.datatemplate;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/XmiTemplateProvider.xml,OSGI-INF/TemplateCreateNewModelElementStrategyProvider.xml,OSGI-INF/BlankTemplateProvider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml b/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
index 4b3670fc3f..c06701fee0 100644
--- a/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.datatemplate</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
index e97a357045..cb50aa1e8f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Domain Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsDomainExpanderDefaultHeuristic.xml,OSGI-INF/EMFFormsDomainExpanderImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
index 751328623e..78e404fa86 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
index c149bb853f..c173424a08 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsIndexDMRExpander.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
index 194da810c0..d5000d196e 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.index</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
index bc3bb9abb6..431daff769 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
index 3455c75ddc..3fd70fffed 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
index e04ebf09a0..4e8f285210 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsMappingDMRExpander.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
index 39e7723041..e7b6309e9d 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
index 9e131b7183..3a6e911bc0 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms TableControl Domain Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.table
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsTableDMRExpander.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
index dff4f475b5..bfd4af761f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.table</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
index 50fce0badc..9029913365 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Edit Support
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.editsupport
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.editsupport;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/emfFormsEditSupport.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.editsupport
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
index 6069de8ebf..7e55c286d3 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,7 +15,7 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   

   <properties>

   	<jacoco.percentage.instruction>0.4</jacoco.percentage.instruction>

diff --git a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
index f4115b5dff..a56ff0567e 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services EMF
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/emfLabelProvider.xml, OSGI-INF/emfLabelProviderDefault.xml, OSGI-INF/databindingService.xml
 Bundle-ActivationPolicy: lazy
@@ -20,14 +20,14 @@ Import-Package: org.eclipse.core.databinding.observable;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.core.runtime;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.common;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.6.0,2.0.0)",
  org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.emf
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
index 8742647f52..34d29f47be 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.emf</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
index 20b0da66d3..ac4f7abc43 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms EMF Specific Service
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emfspecificservice
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.25.0"
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.emfspecificservice
 Service-Component: OSGI-INF/emfSpecificService.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
index 05a527252f..b66395f1c2 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
index 9c918fc60a..d58a1864fe 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Legacy
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.model;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.legacy
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
index 1f60f18b95..036d54eb0b 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
index 600b045240..8a2e8eb796 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Default Locale Provider
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.locale.default
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.24.0"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.25.0"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/defaultLocalizationService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.locale.default
diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
index 116ed40631..6f25cf2bf2 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.locale.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
index 914ce37568..811ebae94f 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Mapping Provider Default Heuristic
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.default
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.defaultheuristic;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsMappingProviderDefaultHeuristic.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="0.0.0"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.default
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
index 9cb7fbe1ee..2180106b80 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.mappingprovider.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
index 8bf83a233a..600c803ab8 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Table Panel
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.panel
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table.panel
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
index 8cbf67856e..3deeda5fe4 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.mappingprovider.table.panel</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
index 109ad933bb..eafa3f58fe 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Mapping Provider Table Control
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
index e9e7d41d08..ad97c8e97e 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.mappingprovider.table</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
index 2111f8266a..4907ebf34f 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Featurepath Segments
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.featurepath
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.24.0";x-friends:="org.eclipse.emfforms.core.services.segments.multi,org.eclipse.emfforms.core.services.segments.index"
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.25.0";x-friends:="org.eclipse.emfforms.core.services.segments.multi,org.eclipse.emfforms.core.services.segments.index"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/FeatureSegmentExpander.xml,OSGI-INF/FeatureSegmentConverter.xml,OSGI-INF/FeatureSegmentStructuralChangeTester.xml,OSGI-INF/FeaturePathDmrSegmentGenerator.xml,OSGI-INF/FeatureDmrToRootEClassConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
index 64451e4897..a7aad5adf9 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
index 0cafa9ba95..0ca5944492 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Index Segments
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.index
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.index;version="1.24.0";x-friends:="org.eclipse.emfforms.core.services.databinding.index"
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.index;version="1.25.0";x-friends:="org.eclipse.emfforms.core.services.databinding.index"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/IndexSegmentConverter.xml,OSGI-INF/IndexSegmentExpander.xml,OSGI-INF/IndexSegmentStructuralChangeTester.xml,OSGI-INF/IndexDmrSegmentGenerator.xml,OSGI-INF/IndexDmrToRootEClassConverter.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
index 6e12cffeba..31b0c5dded 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
index b5b21b6c01..97949644af 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.mapping
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.24.0";x-friends:="org.eclipse.emfforms.core.services.databinding.mapping"
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.25.0";x-friends:="org.eclipse.emfforms.core.services.databinding.mapping"
 Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/MappingSegmentConverter.xml,OSGI-INF/MappingSegmentExpander.xml,OSGI-INF/MappingSegmentStructuralChangeTester.xml,OSGI-INF/MappingDmrSegmentGenerator.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
index 84656e1a25..854293c9a7 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
index ba46e52e88..f7dee3f977 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Multi Segment Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.multi
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.multi;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.multi;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="3.13.0",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsMappingProviderMulti.xml,OSGI-INF/MultiSegmentConverter.xml,OSGI-INF/MultiSegmentExpander.xml,OSGI-INF/TableDmrSegmentGenerator.xml,OSGI-INF/TableDmrToRootEClassConverter.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
index ac586bb6e9..5e1b7d5833 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
index 3f6b74fa09..75d9026d5e 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Services for DMR Segments
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.segments;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.segments;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/SegmentGeneratorService.xml,OSGI-INF/DmrToSegmentsViewServiceFactory.xml,OSGI-INF/LegacyDmrToRootEClassImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.segments/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
index af1a88108c..0bb1460547 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.segments</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
index af69a4871b..4b7e18d8f9 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester Default Heuristic
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.default
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.defaultheuristic;version="1.7.0";x-friends:="org.eclipse.emfforms.core.services.structuralchange.table"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/StructuralChangeTesterDefault.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
index 682003b15b..b5c78de905 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
index 71d917a1d2..81aaa5f1c1 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms StructuralChange Index
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.index
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.index.StructuralChangeTesterIndex.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.index
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
index 4eb8667451..78d33f863c 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.index</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
index e84cfa1130..63233659d6 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute Structural Change Tester
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.keyattribute
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
index 1681c032a7..47fa7e3bcb 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
index 4991bdfbe2..bb2258b8aa 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms StructuralChange Mapping
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.mapping
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.mapping.StructuralChangeTesterMapping.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.mapping
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
index 280c8c966e..59f6c7c6a7 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.mapping</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
index 134ed12ab2..b74422042c 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester Table
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.table
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/StructuralChangeTesterTable.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
index 2954edf777..02143a04ed 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.table</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
index d7b83e472b..7de8345f59 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
index 99803c7707..ecc9eed1f8 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
index be243400b6..761c8dde47 100644
--- a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.reveal;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.controlmapper;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.databinding;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.label;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.reveal;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="1.24.0",
- org.eclipse.emfforms.spi.core.services.view;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.reveal;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.databinding;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.label;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.reveal;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="1.25.0",
+ org.eclipse.emfforms.spi.core.services.view;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -34,10 +34,10 @@ Import-Package: javax.inject;version="[1.0.0,2.0.0)",
  org.eclipse.core.databinding.property.value;version="0.0.0",
  org.eclipse.e4.core.di;version="0.0.0",
  org.eclipse.e4.core.di.suppliers;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.model;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.8.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.core.services
diff --git a/bundles/org.eclipse.emfforms.core.services/pom.xml b/bundles/org.eclipse.emfforms.core.services/pom.xml
index f7a3d63fcf..aa78f31eec 100644
--- a/bundles/org.eclipse.emfforms.core.services/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
index 0bc34c86e8..7bc5353d40 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.datatemplate.provider.DatatemplateEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.datatemplate.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.datatemplate.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
index 2ab4f9c076..8c002a8a88 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.model.edit</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
index 86a6366497..3257995717 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.datatemplate;version="1.24.0";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- org.eclipse.emfforms.datatemplate.impl;version="1.24.0";x-internal:=true;
+Export-Package: org.eclipse.emfforms.datatemplate;version="1.25.0";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.eclipse.emfforms.datatemplate.impl;version="1.25.0";x-internal:=true;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
    org.eclipse.emf.common.util,
    org.eclipse.emf.common.notify,
    org.eclipse.emfforms.datatemplate",
- org.eclipse.emfforms.datatemplate.util;version="1.24.0";
+ org.eclipse.emfforms.datatemplate.util;version="1.25.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl,
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
index 90484b08e1..c37849bf47 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.model</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
index 28fd75ba0f..ff55d72e8a 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms DataTemplate Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.13.1,4.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.TemplateInstanceRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEClassSelectionStrategyProvider.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.ui.view.swt.reference;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.editor;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt.reference;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.editor;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="1.3.0"
 Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
index f3bd19debf..7f67d78d00 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.tooling</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
index 9c7129c5fb..ad160c2c44 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -2,47 +2,47 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ecore Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.actions;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.actions;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/typedElementBoundsControlService.xml,OSGI-INF/ecoreAttachmentStrategyProvider.xml,OSGI-INF/ecoreEObjectSelectionStrategyProvider.xml,OSGI-INF/ecoreOpenInNewContextStrategyProvider.xml,OSGI-INF/ecoreReferenceStrategyProvider.xml,OSGI-INF/typedElementBoundsRevealProvider.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)";resolution:=optional,
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)";resolution:=optional,
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.editor.ecore
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
index aa14fa7571..9618d755f2 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.ecore</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
index 4dd33b1307..8a8905df3d 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Genmodel Editor Utilities
 Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel.util;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
index 337bb230c6..b7d11163a0 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
index 003593b5d6..51fe984be7 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GenModel Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.internal.editor.genmodel.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.24.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
- org.eclipse.emfforms.internal.editor.genmodel.service;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.25.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
+ org.eclipse.emfforms.internal.editor.genmodel.service;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.runtime;version="3.4.0"
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
index 31959f1826..1388f2576c 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.genmodel</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
index dacd8f17bb..16251cf4c5 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewModel Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.viewmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
+Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.ide;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
index b52d4371d3..a86c4c500f 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.viewmodel</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
index f5cbf3e3f8..a68975619b 100644
--- a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
@@ -2,36 +2,36 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.internal.editor.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.handlers;version="1.24.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.editor.toolbaractions;version="1.24.0";;x-internal:=true;x-internal:=true,
- org.eclipse.emfforms.internal.editor.ui;version="1.24.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.spi.editor;version="1.24.0",
- org.eclipse.emfforms.spi.editor.handler;version="1.24.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.24.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel",
- org.eclipse.emfforms.spi.editor.messages;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.editor;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.handlers;version="1.25.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.editor.toolbaractions;version="1.25.0";;x-internal:=true;x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ui;version="1.25.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.spi.editor;version="1.25.0",
+ org.eclipse.emfforms.spi.editor.handler;version="1.25.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.25.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel",
+ org.eclipse.emfforms.spi.editor.messages;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.editor
diff --git a/bundles/org.eclipse.emfforms.editor/pom.xml b/bundles/org.eclipse.emfforms.editor/pom.xml
index 48952ccbbd..bba34f6839 100644
--- a/bundles/org.eclipse.emfforms.editor/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
index 6b8436fd6e..d56938b061 100644
--- a/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emfforms.ide.builder;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.ide.internal.builder.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.builder;version="1.24.0",
- org.eclipse.emfforms.ide.internal.builder;version="1.24.0";x-friends:="org.eclipse.emfforms.ide.builder.test",
- org.eclipse.emfforms.ide.internal.builder.messages;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.builder;version="1.25.0",
+ org.eclipse.emfforms.ide.internal.builder;version="1.25.0";x-friends:="org.eclipse.emfforms.ide.builder.test",
+ org.eclipse.emfforms.ide.internal.builder.messages;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
@@ -15,12 +15,12 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)"
 Import-Package: org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.ide.builder
 Service-Component: OSGI-INF/org.eclipse.emfforms.ide.internal.builder.ViewModelValidationDelegate$Provider.xml,OSGI-INF/org.eclipse.emfforms.ide.internal.builder.ViewModelMarkerHelper$Provider.xml
diff --git a/bundles/org.eclipse.emfforms.ide.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.builder/pom.xml
index 3860d37f7c..824e1268ac 100644
--- a/bundles/org.eclipse.emfforms.ide.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.builder/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.builder</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
index 0af0423c00..8ebcc48d92 100644
--- a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emfforms.ide.datatemplate.builder;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.datatemplate.internal.builder;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.datatemplate.internal.builder;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.ide.datatemplate.internal.builder.DataTemplateValidationDelegateProvider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
index cdb51987a5..2f7ce2b6c1 100644
--- a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.datatemplate.builder</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
index 87f4c99671..f07eb41ed6 100644
--- a/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emfforms.ide.ecore.builder;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.ecore.internal.builder;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.ecore.internal.builder;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.ide.ecore.internal.builder.EcoreValidationDelegateProvider.xml
diff --git a/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
index af2a7d69cc..a6448e7370 100644
--- a/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.ecore.builder</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
index f27aaacfe0..95d4cb126a 100644
--- a/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Preferences
 Bundle-SymbolicName: org.eclipse.emfforms.ide.preferences;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.preferences;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.ide.preferences;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.ide.preferences;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.ide.preferences;version="1.25.0"
 Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.equinox.preferences;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.preferences
diff --git a/bundles/org.eclipse.emfforms.ide.preferences/pom.xml b/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
index 0c20875c98..5dba825bdb 100644
--- a/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.preferences</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
index 876c2e0887..6fe5a0ab76 100644
--- a/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Index Segment IDE Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.indexsegment;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.view.indexsegment;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.indexsegment;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/IndexSegmentIdeDescriptor.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
index 11636e26ce..c4af5de5f4 100644
--- a/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.ide.view.indexsegment</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
index 8289f22589..4e9924ebad 100644
--- a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment IDE Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.mappingsegment;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/MappingSegmentIdeDescriptor.xml,OSGI-INF/MappedEClassControlSWTRendererTester.xml
diff --git a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
index 2130b61357..6911d71241 100644
--- a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
index 4921ab48a7..96bc567136 100644
--- a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
@@ -2,34 +2,34 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Multi Segment IDE Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/MultiSegmentChildDmrOpenInNewContextStrategyProvider.xml,OSGI-INF/MultiDmrNewReferenceElementStrategyProvider.xml,OSGI-INF/MultiSegmentIdeDescriptor.xml,OSGI-INF/MultiSegmentChildDmrNewModelElementStrategyProvider.xml,OSGI-INF/MultiDmrOpenInNewContextStrategyProvider.xml,OSGI-INF/MultiSegmentChildDmrsSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
index 9da3498036..9a1a19c5d5 100644
--- a/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.ide.view.multisegment</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
index 6489108bef..a47d12e5c4 100644
--- a/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Segments IDE Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.segments
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.ide.view.segments;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.ide.view.segments;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.preferences;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.preferences;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.ide.view.segments.DmrToSegmentsMigratorImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml b/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
index 47ba4e7dd5..cb03bfbd09 100644
--- a/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.view.segments</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
index cc7a03c9f6..4f4613151c 100644
--- a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emfforms.ide.viewtemplate.builder;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.viewtemplate.internal.builder;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.viewtemplate.internal.builder;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.ide.viewtemplate.internal.builder.ViewTemplateValidationDelegateProvider.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
index 77d2c34e37..92fc15f2e2 100644
--- a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.ide.viewtemplate.builder</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
index 8f9e7464b1..63fdf1db71 100644
--- a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Localization
 Bundle-SymbolicName: org.eclipse.emfforms.localization
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.localization;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.localization;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.localization
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.24.0]",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.24.0]",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.25.0]",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.25.0]",
  org.eclipse.osgi.service.localization;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="1.2.0",
diff --git a/bundles/org.eclipse.emfforms.localization/pom.xml b/bundles/org.eclipse.emfforms.localization/pom.xml
index a21477d93b..d169e79520 100644
--- a/bundles/org.eclipse.emfforms.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.localization/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
index 6a41e8eae1..8a88b037c9 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.spi.rulerepository.model.provider.RulerepositoryEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.rulerepository.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.rulerepository.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
index d21d9ccf0b..a19376d372 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
index 3515a5a8ff..9a2362a0ef 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.24.0",
- org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.24.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
- org.eclipse.emfforms.spi.rulerepository.model.util;version="1.24.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.25.0",
+ org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.25.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
+ org.eclipse.emfforms.spi.rulerepository.model.util;version="1.25.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.rulerepository.model
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
index 67f3afe3ee..2bd1beb16f 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
index 78d7345e59..e15ba941f0 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms RuleRepository Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
@@ -14,21 +14,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.rulerepository.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.rulerepository.tooling
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
index b7dc4d4ad3..920ac37ca2 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
index be3716ebe0..a61967f5f5 100644
--- a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
@@ -2,46 +2,46 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Base Dependencies
 Bundle-SymbolicName: org.eclipse.emfforms.setup.base
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.25.0,1.25.1)"
diff --git a/bundles/org.eclipse.emfforms.setup.base/pom.xml b/bundles/org.eclipse.emfforms.setup.base/pom.xml
index b541b3a95b..4febf232d8 100644
--- a/bundles/org.eclipse.emfforms.setup.base/pom.xml
+++ b/bundles/org.eclipse.emfforms.setup.base/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
index 5ada64493e..deb0fa5e39 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Categorization renderer using an Expandbar
 Bundle-SymbolicName: org.eclipse.emfforms.swt.categorization.expandbar
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.rap.rwt;bundle-version="[3.0.2,4.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
@@ -18,13 +18,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.categorization.expandbar.CategorizationElementExpandBarRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
index 3e7b8bb164..fa53451478 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.categorization.expandbar</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
index 65c98fb7fd..f952505f9a 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Renderer for Multi EAttributes
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.control.multiattribute;version="1.24.0",
- org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.control.multiattribute;version="1.25.0",
+ org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/MultiAttributeRendererService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
index 1c74bff3cd..64827b1dd0 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
index 9e0cb6510a..ce6c03b389 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Text Control with Autocomplete
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer.AutocompleteTextControlSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.fieldassist;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
index c2279f9a4f..69f968c166 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
index d7a1b83c3a..4e7fb55719 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Rich Text Control
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.richtext;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.102.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)"
@@ -24,7 +24,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="0.0.0",
  org.osgi.service.component.annotations;version="0.0.0";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.swt.control.text.richtext
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
index d45109ec52..d94119e29b 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
index 25e699aa84..a88d32fae4 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Control Grid SWT Renderer
 Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.24.0"
-Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.25.0"
+Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/ControlGridSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
index 03251ff755..5822330ca7 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
index 9f9176715c..11e7fe596f 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Core DI Extension
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.core.di.extension
 Service-Component: OSGI-INF/emfFormsDIExtensionRendererFactory.xml
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
index 76ce5fe14a..8991d99011 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.swt.core.di.extension</artifactId>
 <packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
index cbeb4a62e2..45cd872107 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core DI
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core.di;version="1.24.0"
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core.di;version="1.25.0"
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/emfFormsDIRendererFactory.xml,OSGI-INF/e4ContextViewServiceFactory.xml,OSGI-INF/rendererSupplier.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.common.di;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.common.di;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.swt.core.di
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
index de8154777a..cdab5310d7 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.swt.core.di</artifactId>
 <packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
index 10841a01ad..43a4469d0b 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core Plugin
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.plugin
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyAdditionalRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyRendererService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
 Automatic-Module-Name: org.eclipse.emfforms.swt.core.plugin
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
index a6ab68f54f..fdc6a13e63 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
index 8705f4d518..033e91e0de 100644
--- a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.internal.swt.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.ui;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.24.0",
- org.eclipse.emfforms.spi.swt.core.data;version="1.24.0",
- org.eclipse.emfforms.spi.swt.core.layout;version="1.24.0",
- org.eclipse.emfforms.spi.swt.core.ui;version="1.24.0",
- org.eclipse.emfforms.spi.swt.core.util;version="1.24.0",
- org.eclipse.emfforms.swt.core;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.ui;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.core.data;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.core.layout;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.core.ui;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.core.util;version="1.25.0",
+ org.eclipse.emfforms.swt.core;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
-Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
+Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.core/pom.xml b/bundles/org.eclipse.emfforms.swt.core/pom.xml
index c90ce86eef..300ee08bac 100644
--- a/bundles/org.eclipse.emfforms.swt.core/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
index 924b0c8e67..1df85adb56 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Reference Selection Composite
 Bundle-SymbolicName: org.eclipse.emfforms.swt.reference.table;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/selectionTableCompositeStrategyProvider.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.core.swt;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.core.swt;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml b/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
index a5660ec501..3c9333c859 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.swt.reference.table</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
index b945499298..32d3e9f614 100644
--- a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table
 Bundle-SymbolicName: org.eclipse.emfforms.swt.table
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.action;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.messages;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.util;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.24.0",
- org.eclipse.emfforms.spi.swt.table.action;version="1.24.0",
- org.eclipse.emfforms.spi.swt.table.util;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.action;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.messages;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.table.action;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.table.util;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.table
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.eclipse.jface.bindings.keys;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.table/pom.xml b/bundles/org.eclipse.emfforms.swt.table/pom.xml
index 63c3d1ccdb..b0857e8c57 100644
--- a/bundles/org.eclipse.emfforms.swt.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.table/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.table</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
index 8b924d91fe..088baa0437 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms TreeViewer Validation Decorator using ECP Validation Service
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.25.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
index 8cc97ab921..af6e42f86f 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
index e27337b685..9c625b3d4b 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Treemasterdetail SWT Util
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.24.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.24.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
- org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.24.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.24.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.24.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.24.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.24.0"
+Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.25.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.25.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
+ org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.25.0"
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.registry;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.action;version="0.0.0",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
index 51a80e413a..7259319b63 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.treemasterdetail</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <properties>
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
index e3f1b0bdfd..f505e5b19f 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfforms.spi.view.annotation.model.provider.AnnotationEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.view.annotation.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
index 68a0bbee36..99300404fb 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
index b956cfe538..e6ea128997 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.24.0",
- org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.24.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.25.0",
+ org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.25.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.annotation.model
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
index 81f44f49e1..c4afe06971 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
index 9a9008c570..e860e01048 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider.ControlgridEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.controlgrid.model.edit
-Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.24.0,1.24.1)";resolution:=optional,
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.24.0,1.24.1)";resolution:=optional
+Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.25.0,1.25.1)";resolution:=optional,
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.25.0,1.25.1)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
index 85f8974fcc..ca1d1816e1 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
index 4429066f39..06b341962c 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.24.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.24.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.25.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.25.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.controlgrid.model
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
index 9ad0ac254e..aa890b800d 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
index dd8ebe2bcf..19d6b09ca5 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.indexsegment.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.spi.view.indexsegment.model.provider.IndexsegmentEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.view.indexsegment.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
index d81cf0e7f4..71b730ca98 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.indexsegment.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
index 180bbf7105..64d29dbc90 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.indexsegment.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model;version="1.24.0",
- org.eclipse.emfforms.spi.view.indexsegment.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.indexsegment.model.util;version="1.24.0";x-friends:="org.eclipse.emfforms.view.indexsegment.model.edit"
+Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model;version="1.25.0",
+ org.eclipse.emfforms.spi.view.indexsegment.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.indexsegment.model.util;version="1.25.0";x-friends:="org.eclipse.emfforms.view.indexsegment.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.indexsegment.model
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
index 5f99376200..46ea5b3207 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.indexsegment.model</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
index d838cafd30..d2dd8ba9c5 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.mappingsegment.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.spi.view.mappingsegment.model.provider.MappingsegmentEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.view.mappingsegment.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
index a8a14c1594..8dafdfa91f 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.mappingsegment.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
index 700653f89d..1652393ffc 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.mappingsegment.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model;version="1.24.0",
- org.eclipse.emfforms.spi.view.mappingsegment.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.mappingsegment.model.util;version="1.24.0";x-friends:="org.eclipse.emfforms.view.mappingsegment.model.edit"
+Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model;version="1.25.0",
+ org.eclipse.emfforms.spi.view.mappingsegment.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.mappingsegment.model.util;version="1.25.0";x-friends:="org.eclipse.emfforms.view.mappingsegment.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.mappingsegment.model
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
index bb4749efae..4329707075 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.mappingsegment.model</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
index cf87f271b9..b9f4a0db36 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Localization
 Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.view.model.localization
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="1.5.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
index 808d32b2e1..9bd41d3c1d 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
index bf5e1c1666..ff3e928405 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.multisegment.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.view.spi.multisegment.model.provider.MultisegmentEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.emfforms.view.spi.multisegment.model.provider;version="2.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.view.multisegment.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
index ba5d8b0d03..25c522045c 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.multisegment.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
index 95a0c55c09..b2ac9b0ed1 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.multisegment.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.view.spi.multisegment.model;version="1.24.0",
- org.eclipse.emfforms.view.spi.multisegment.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.view.spi.multisegment.model.util;version="1.24.0";x-friends:="org.eclipse.emfforms.view.multisegment.model.edit"
+Export-Package: org.eclipse.emfforms.view.spi.multisegment.model;version="1.25.0",
+ org.eclipse.emfforms.view.spi.multisegment.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.view.spi.multisegment.model.util;version="1.25.0";x-friends:="org.eclipse.emfforms.view.multisegment.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emfforms.view.multisegment.model
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
index 5f9213e9f8..915d5077a3 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.view.multisegment.model</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
index 607b81bf9c..83c58b1a23 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
@@ -9,12 +9,12 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.emfforms.spi.spreadsheet.core.error.model.provider;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.10.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.error.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
index 2f02a92858..1c6c9e86b1 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
@@ -11,13 +11,13 @@ Export-Package: org.eclipse.emfforms.spi.spreadsheet.core.error.model;version="1
  org.eclipse.emfforms.spi.spreadsheet.core.error.model.util;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Import-Package: org.eclipse.core.databinding.observable.list;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.core.databinding.property.list;version="0.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.internal.core.services.label;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.internal.core.services.label;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.error.model
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
index 8869a07c1b..516beeabb3 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.categorizati
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.6.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.categorization
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
index bd91083327..5f0cfd3731 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.custom
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
index 5b787e877a..3b1518311e 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
@@ -5,19 +5,19 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.table
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.spreadsheet.core.renderer;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emfforms.spreadsheet.core.renderer;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="1.8.0",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.table
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
index d2f3840638..b9a9e10638 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
@@ -6,21 +6,21 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)"
 Import-Package: org.eclipse.core.databinding.observable;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
  org.eclipse.emf.ecore.xmi;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.context;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.spi.context;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="1.6.0",
  org.osgi.service.component.annotations;version="1.2.0"
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
index dc2f884a52..e02d332664 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
@@ -11,22 +11,22 @@ Export-Package: org.eclipse.emfforms.internal.spreadsheet.core;version="1.0.0";x
  org.eclipse.emfforms.spi.spreadsheet.core;version="1.0.0",
  org.eclipse.emfforms.spi.spreadsheet.core.converter;version="1.0.0",
  org.eclipse.emfforms.spi.spreadsheet.core.transfer;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.apache.poi;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)"
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="1.6.0",
  org.osgi.service.component.annotations;version="1.2.0"
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
index 67480224a7..e5e4445924 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.file;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.internal.spreadsheet.file.messages;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.spi.spreadsheet.file;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.10.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.file
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.osgi.util;version="1.1.0",
  org.osgi.framework;version="[1.2.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
index 622d1fd03f..c8a3651b79 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.stream;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.internal.spreadsheet.stream.messages;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.spi.spreadsheet.stream;version="1.0.0"
-Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
+Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.10.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.stream
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.osgi.util;version="1.1.0",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
index d48d66eb55..f7a17b9a15 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample Application e3
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e3;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Framework
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.e3
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
index f6123ae408..6fa1843904 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   
   <properties>
   	<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
index f427080a36..bef55c8181 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample Application e4
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e4;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.25.0";x-internal:=true
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="[3.9.100,4.0.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
@@ -16,10 +16,10 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.ui.di;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.1,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.e4
 Import-Package: javax.annotation;version="1.0.0"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
index f7120352f4..e0a3e59cd8 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <properties>
   	<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
index dcc7517d04..9a6ba22b2c 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample J2ee RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee;version="1.4.0";x-internal:=true
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.jface;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.jface.databinding;bundle-version="[2.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
index 2128292adc..ae215b1d6e 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,7 +15,7 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

   <properties>

   	<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
index 8343cac07d..4af6a305bf 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample RAP Application
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Framework
 Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap;version="1.0.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.rap.ui.workbench;bundle-version="[2.3.0,4.0.0)",
  org.eclipse.rap.jface;bundle-version="[2.3.0,4.0.0)",
  org.eclipse.rap.ui;bundle-version="[2.3.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.rap
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
index ec4aee2425..9a33ed7a99 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 
   <properties>
   	<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
index 6588a692da..54383977db 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.makeithappen.e3"
       label="The Make it happen 3x Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.makeithappen.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
index 38504d7ead..c2c5dcd3e4 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-examples-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.makeithappen.e3</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<build>
 		<plugins>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
index c5cb02c037..37a32d41ce 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.makeithappen.e4"
       label="The Make it happen e4 Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.makeithappen.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
index 2cf31374f9..a57d2548f9 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-examples-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.makeithappen.e4</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<build>
 		<plugins>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
index ff369046b4..4280710bd8 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.makeithappen.feature"
       label="EMF Forms MakeItHappen Example (Target Feature)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.makeithappen.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
index 1b411eed2e..7487438003 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-examples-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.makeithappen.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
index 676bc4c304..2a958b4242 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.makeithappen.model.task.provider.TaskEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.model.edit
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
index 027eeef1c5..f63ca7452a 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
index 10de40be54..cdbbe123cf 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.makeithappen.model.viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.viewmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
index 4744073853..d87b455345 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
index 9b72a6a997..1e72bdb34f 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.24.0",
- org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.24.0",
- org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.25.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.25.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
index 0f5a6209fe..b38da38c49 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
index c0f92da16d..a91287cd06 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EmailControl
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.email.renderer;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/emailRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
index 058e3b105b..fe47d197da 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
index 47cd6f21ba..6c617b8730 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expandbar Group Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.group.renderer;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: lib/org.eclipse.nebula.widgets.pgroup_1.0.0.201905211554.jar,
  .
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.24.0",
+Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.25.0",
  org.eclipse.nebula.widgets.pgroup;version="1.0.0",
  org.eclipse.nebula.widgets.pgroup.internal;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)"
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
index 2be2b40ccc..257f525267 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
index da1b743b19..04ea7b4906 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Make It Happen Examples
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.makeithappen.internal.wizards.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
index 71564ba5ff..9e4e286679 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
@@ -6,7 +6,7 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-examples-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

 	</parent>

 

@@ -14,7 +14,7 @@
 	<packaging>eclipse-plugin</packaging>

 

 	<groupId>org.eclipse.emf.ecp</groupId>

-	<version>1.24.0-SNAPSHOT</version>

+	<version>1.25.0-SNAPSHOT</version>

 	<build>

 		<plugins>

 			<plugin>

diff --git a/examples/org.eclipse.emfforms.coffee.feature/feature.xml b/examples/org.eclipse.emfforms.coffee.feature/feature.xml
index 8244f1ac88..1d5de93a0c 100644
--- a/examples/org.eclipse.emfforms.coffee.feature/feature.xml
+++ b/examples/org.eclipse.emfforms.coffee.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.coffee.feature"
       label="Coffee Example Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.coffee.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emfforms.coffee.feature/pom.xml b/examples/org.eclipse.emfforms.coffee.feature/pom.xml
index 449aeacbd4..cd0a316970 100644
--- a/examples/org.eclipse.emfforms.coffee.feature/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-examples-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.coffee.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	   <build>
diff --git a/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
index 22afda53e6..81b081166a 100644
--- a/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.coffee.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.coffee.model.coffee.provider.CoffeeEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.coffee.model.coffee.provider;version="1.24.0"
+Export-Package: org.eclipse.emfforms.coffee.model.coffee.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.coffee.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emfforms.coffee.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emfforms.coffee.model.edit
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml b/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
index 0bf2215b66..86d4cad839 100644
--- a/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emfforms.coffee.model.edit</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
index 49dad76300..7c994638a7 100644
--- a/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emfforms.coffee.model.viewmodel
 Bundle-SymbolicName: org.eclipse.emfforms.coffee.model.viewmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+Bundle-Version: 1.25.0.qualifier
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
diff --git a/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml b/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
index cf7fc11c1f..8f16f9d3ef 100644
--- a/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.coffee.model.viewmodel</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
index 20047a5199..9286530409 100644
--- a/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.coffee.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.coffee.model.coffee;version="1.24.0",
- org.eclipse.emfforms.coffee.model.coffee.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.coffee.model.coffee.util;version="1.24.0"
+Export-Package: org.eclipse.emfforms.coffee.model.coffee;version="1.25.0",
+ org.eclipse.emfforms.coffee.model.coffee.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.coffee.model.coffee.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/examples/org.eclipse.emfforms.coffee.model/pom.xml b/examples/org.eclipse.emfforms.coffee.model/pom.xml
index 6642620d50..4db5db38e2 100644
--- a/examples/org.eclipse.emfforms.coffee.model/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emfforms.coffee.model</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
index c242d7f1be..9a627e8742 100644
--- a/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Coffee Model Example Wizards
 Bundle-SymbolicName: org.eclipse.emfforms.coffee.wizards;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.coffee.wizards;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.coffee.wizards;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
diff --git a/examples/org.eclipse.emfforms.coffee.wizards/pom.xml b/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
index 43cd744711..6fe1a18b91 100644
--- a/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
@@ -6,13 +6,13 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-examples-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

 	</parent>

 

 	<groupId>org.eclipse.emf.ecp</groupId>

 	<artifactId>org.eclipse.emfforms.coffee.wizards</artifactId>

-	<version>1.24.0-SNAPSHOT</version>

+	<version>1.25.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 

 	<build>

diff --git a/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
index f786088c58..09aea22262 100644
--- a/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Wizards for EMFForms Examples
 Bundle-SymbolicName: org.eclipse.emfforms.example.common.wizards;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.example.wizards;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.example.wizards;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.example.wizards;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.example.wizards;version="1.25.0"
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
diff --git a/examples/org.eclipse.emfforms.example.common.wizards/pom.xml b/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
index 317ff90b62..8566de3586 100644
--- a/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
+++ b/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
@@ -6,12 +6,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-examples-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

 	</parent>

 

 	<groupId>org.eclipse.emf.ecp</groupId>

 	<artifactId>org.eclipse.emfforms.example.common.wizards</artifactId>

-	<version>1.24.0-SNAPSHOT</version>

+	<version>1.25.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>

diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index 06674e0a05..a97b61e980 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
@@ -14,12 +14,12 @@
 <feature
       id="org.eclipse.emf.ecp.cdo.feature"
       label="ECP CDO Integration (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.cdo.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       Integration of the CDO model repository.
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
index d0e96c522c..b9190bde51 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
index d09df8c23b..df63ec5a24 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.changebroker.feature"
       label="ECP Change Broker Feature (do not install into IDE)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.changebroker"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       Generic Observer Bus for EMF Notifications including an ECP/EMFStore-Bridge.
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
index 016cf78628..3d9c389789 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
index 47fff1d5de..73065dd86d 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.demo.e3.feature"
       label="ECP e3 Demo Application"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.application.e3"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
index e1acb4c2fc..20226f756b 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.demo.e3.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
index d684548195..47f836f07a 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.demo.e4.feature"
       label="ECP e4 Demo Application"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.application.e4"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
index 43786a2d95..94b6d82fd8 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.demo.e4.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
index 59c5adddf1..c63c7cf81d 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.diffmerge.feature"
       label="ECP DiffMerge Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.diffmerge.context"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
index cc77e2dd9a..bb128852dc 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
index deb9d6d231..3aa7e193e5 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.e3.feature"
       label="ECP 3.x UI Integration"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.ui.e3"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       Integration of the EMF Client Platform UI into the Eclipse 3.x workbench, including views and perspectives.
diff --git a/features/org.eclipse.emf.ecp.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
index 1064623280..feb7f9493e 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.e3.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
index aa530d824b..2201078059 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.e4.feature"
       label="ECP e4 UI Integration"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.e4"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
index 37398a22dc..b1ef68d2db 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.e4.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
index 99ac1383d7..0f8d65a1a5 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature

       id="org.eclipse.emf.ecp.ecore.editor.feature"

       label="Ecore Editor Wizard Feature"

-      version="1.24.0.qualifier"

+      version="1.25.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.ecp.ecore.editor.ui"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.24.0.qualifier">

+      license-feature-version="1.25.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
index c8b47d46e3..61903535dd 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-features-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.feature</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
index c529846a23..a644050fd1 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.ecore.feature"
       label="EMF Forms Ecore Model Controls"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.edit.ecore.swt"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
index df5ab1ea32..f2e81d8db3 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ecore.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
index 9fcf639b21..416951e424 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emf2web.feature"
       label="JSON Forms Integration"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
index 1ae3aa90b5..5516f18664 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.emf2web.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
index bd266ca82c..dc569f4757 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.idetooling.feature"
       label="EMF Forms IDE Tooling"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
index dcf1215268..82bd762843 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfforms.idetooling.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
index 54b245d5b7..f0be4eeb6b 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.runtime.feature"
       label="EMF Forms Runtime"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
index 5a15f5eedf..d45c9081ea 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.emfforms.runtime.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
index c236db91df..2491ee14e0 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.sdk.feature"
       label="EMF Forms SDK"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
index 920a70ea7c..59c8461554 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.emfforms.sdk.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
index e83153e4df..d3c08b4e5f 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.emfstore.feature"
       label="ECP EMFStore Integration"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.emfstore.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
index 117ee1f592..8f86b9ce8f 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
index 1a064dcadb..5614bab928 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.examplemodel.ui.feature"
       label="Example Model UI Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.examplemodel.ui"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
index b378e433fe..0a91e2530b 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.examplemodel.ui.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   	<build>
diff --git a/features/org.eclipse.emf.ecp.feature/feature.xml b/features/org.eclipse.emf.ecp.feature/feature.xml
index 93587e4292..20e2b71c71 100644
--- a/features/org.eclipse.emf.ecp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.feature/feature.xml
@@ -14,12 +14,12 @@
 <feature
       id="org.eclipse.emf.ecp.feature"
       label="ECP Core"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       The core platform containing the model workspace, the navigator, the editor and the repository browser.
diff --git a/features/org.eclipse.emf.ecp.feature/pom.xml b/features/org.eclipse.emf.ecp.feature/pom.xml
index 38591cfe3f..6c220f92e4 100644
--- a/features/org.eclipse.emf.ecp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.i18n.feature/feature.xml b/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
index ad109604f1..a35d92a24a 100644
--- a/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.i18n.feature"
       label="ECP i18n Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.i18n.feature/pom.xml b/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
index b5b6a3deb5..646fdea77e 100644
--- a/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.i18n.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml b/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
index 2d0c18eb37..a38af11ffc 100644
--- a/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.ide.migration.feature"
       label="Namespace View Model Migration Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml b/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
index 41c1768d98..8076dcd307 100644
--- a/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.migration.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.license.feature/feature.xml b/features/org.eclipse.emf.ecp.license.feature/feature.xml
index a03571756b..0fdd8e5e9b 100644
--- a/features/org.eclipse.emf.ecp.license.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.ecp.license.feature"

       label="EMF Client Platform License"

-      version="1.24.0.qualifier"

+      version="1.25.0.qualifier"

       provider-name="Eclipse Modeling Project"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.emf.ecp.license.feature/pom.xml b/features/org.eclipse.emf.ecp.license.feature/pom.xml
index f4fd47ed3a..468270ecfd 100644
--- a/features/org.eclipse.emf.ecp.license.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.license.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.rap.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
index 1b77d9a286..47701e6285 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.rap.feature"
       label="ECP RAP Demo Application (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.rap"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
index 86758f4f6d..da9f1b9d8c 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
index 9c534bc596..67ad4f7d24 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.rap.sdk.feature"
       label="ECP RAP SDK (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
index 58d700c3f8..48248670c5 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.rap.sdk.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
index 95bbac7efe..a349ea35a1 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.rap.util.feature"
       label="ECP RAP UI Integration"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.rap.util"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
index 531ad20c78..714bfefd80 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.util.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
index 8636a249cb..489e088fc0 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.sdk.e4.feature"
       label="ECP SDK e4 (Target Feature)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
index b563c23f31..355d131cd8 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.sdk.e4.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
index 429413f8fe..1b3b72573b 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.sdk.feature"
       label="ECP SDK 3.x"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
index 1ace5c56a8..bcff49b26b 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.sdk.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index 68911b77a4..4274864c57 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.target.feature"
       label="ECP Target Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       The target platform feature for the EMF Client Platform, for developer use only.
diff --git a/features/org.eclipse.emf.ecp.target.feature/pom.xml b/features/org.eclipse.emf.ecp.target.feature/pom.xml
index dedc2e2864..42d91a28ef 100644
--- a/features/org.eclipse.emf.ecp.target.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.target.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
index 6ad94a685c..d10e5667ba 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.transaction.feature"
       label="ECP Transactional Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.transaction"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
index 73df676ece..96358973ea 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-features-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.transaction.feature</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
index b367199bcc..d50bad201e 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.validation.view.feature"
       label="ECP Validation View (Highly Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.ui.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
index e9b33f0c3f..aadc40182d 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.view.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
index df4b15a8c9..11e4a76885 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.categorization.feature"
       label="EMF Forms Categorization Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.categorization.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
index 06b7257e96..596b72ed2d 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.categorization.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
index 015fc92250..8f61ab4d2f 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.compoundcontrol.feature"
       label="EMF Forms Compound Control Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.compoundcontrol.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
index 824095e461..e3dfbc6705 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
index 8c483c5cdd..08f73cc1e0 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.custom.feature"
       label="EMF Forms Custom Control Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.custom.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
index cbaf1f3d1b..00dcbb65fe 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.custom.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
index b8964d96e4..d781d1c948 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.di.feature"
       label="EMF Forms Dependency Injection Feature (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.model.common.di"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
index 9b3d25f204..e4e04a7f23 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
index 76ea6363ef..954cc22543 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.edapt.feature"
       label="EMF Forms IDE Tooling Edapt View Model Migration Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.edapt"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
index bb737f14cf..a644e71bbf 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.edapt.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   	<build>
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
index 25a363b8c0..b9a5b6aea4 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.group.feature"
       label="EMF Forms Group Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.group.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
index eb46f6659c..0cb88eb569 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.group.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
index f724ca7b3f..05dab4bc39 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature"
       label="EMF Forms Collapsible Group Renderer using Nebula PGroup"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
index c280125735..80aeb1ab3c 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
index 3f4daac06a..238a680179 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.groupedgrid.feature"
       label="EMF Forms Grouped Grid Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.groupedgrid.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
index 77186c3e80..efe162a3da 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
index 881d838356..234382c19b 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.horizontal.feature"
       label="EMF Forms Horizontal Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.horizontal.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
index 3fabc02484..2c499fe9ad 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.horizontal.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
index a76c3e00e3..811c263789 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.indexdmr.feature"
       label="EMF Forms Index DMR Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.indexdmr.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
index 3aaaf12826..2bf43298a9 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.indexdmr.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
index b5cb0aa693..a0587c5b63 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.keyattributedmr.feature"
       label="EMF Forms Key Attribute DMR Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.keyattributedmr.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
index 2081c03ffa..4715c624a0 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.keyattributedmr.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
index 1307c55464..dacede85d5 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.label.feature"
       label="EMF Forms Label Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.label.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
index 115133e130..8a024436d2 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.label.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
index a0c94aa9fe..0e2525c5fc 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.mappingdmr.feature"
       label="EMF Forms Mapping DMR Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.mappingdmr.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
index 49bf2596f8..b0a9a0a105 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.mappingdmr.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
index 8ee923d990..c963948f75 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.controls.feature"
       label="EMF Forms View Model Controls"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.view.editor.controls"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
index 719ceacaab..21b9e27fc8 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.controls.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
index e8cb02ad51..c6fa9dcb3e 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.editor.feature"
       label="EMF Forms View Model Wizard"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.model.editor"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
index 3ebc6ea69a..7b926ad853 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
index 9fa04edcd6..c96f58e772 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.viewmodel.feature"
       label="EMF Forms Core Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
index e9be257c9f..35cb4dec2d 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.viewmodel.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
index 014a3a7319..ef7e7b6681 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.rule.feature"
       label="EMF Forms Rule Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.rule"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
index 4804b678c0..78bdc18f1c 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.rule.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
index 9ac90f62f2..a668cbc307 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.section.feature"
       label="EMF Forms Section Model (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.section.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
index b89866834b..2e751178ab 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.section.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
index 30fc549481..8dc846cd72 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.stack.feature"
       label="EMF Forms Stack Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.stack.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
index 90cd32603b..bbe3d3de37 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.stack.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
     <build>
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
index 4ecd2d71df..132209a37f 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.celleditor.rcp.feature"
       label="EMF Forms Table UI SWT Additional Cell Editors (non-RAP)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.table.celleditor.rcp"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
index 20e39df2f9..78e6250850 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.celleditor.rcp.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
index 373f3b332e..62b67f4684 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.feature"
       label="EMF Forms Table Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
index c935c24082..1afd1eeebf 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
index 13581db31a..ce98983f53 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature"
       label="EMF Forms Nebula Grid Table UI Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.ui.nebula.grid"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
index 7825330e4c..bef4246c6d 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
index e3abd80d04..9196097ca1 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.rcp.feature"
       label="EMF Forms Table UI RCP Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.ui.rcp"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
index cafab37aa0..66f1ecabd4 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.rcp.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
index 20dbcc65f1..586376bcce 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature"
       label="EMF Forms Persist Table State Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
index 1c6849d323..83ea39d01b 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
index ba401cfbe4..23327e1458 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.template.feature"
       label="EMF Forms Template  Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.template.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
index f9889b930c..5560cb0862 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.template.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
index 349aed4d2d..4a9f2f5676 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.treemasterdetail.feature"
       label="EMF Forms Master-Detail Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.treemasterdetail.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
index 20d3ee9133..5b6c7cee46 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
index e5e49fd87d..e4b76b6dc9 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.unset.feature"
       label="EMF Forms Unset Service"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.unset"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
index fcf7893d55..729ac2c890 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.unset.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
index 8277fd8c72..5b172519da 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.bean.feature"
       label="EMF Forms Bean Validation Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation.bean"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
index 0d45c1dc71..c104ff8f76 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
index 65b2a2f2c1..06f738ec92 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.feature"
       label="EMF Forms Validation Service"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
index d8a3682a58..24bb4cf34b 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
index 5f4b0a7b7b..05b5089911 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.initial.feature"
       label="EMF Forms Deep Validation Initial Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
index 482a26fe87..4f0fd57ea9 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.initial.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
index 2f3ff97c1c..d1096ffbb7 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.vertical.feature"
       label="EMF Forms Vertical Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.vertical.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
index 76425fe5c9..a493e7d83d 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.vertical.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
index 1e54eade02..d5d757e940 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.viewproxy.feature"
       label="EMF Forms View Proxy Model"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.viewproxy.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
index 4881c61a85..2370f07ef0 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.viewproxy.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
index 5870e3e27c..a73162b211 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
@@ -14,12 +14,12 @@
 <feature
       id="org.eclipse.emf.ecp.workspace.feature"
       label="ECP File Integration (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.workspace.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       Integration for file and Eclipse workspace persistence.
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
index 15df854517..d93449e161 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.workspace.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
index 759945692a..fa5dc1d288 100644
--- a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.common.prevalidation.feature"
       label="EMFForms PreValidation Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.common.prevalidation"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
index 88196d41d2..9a127f92a7 100644
--- a/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.common.prevalidation.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml b/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
index a9949a9863..98e18958ef 100644
--- a/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
+++ b/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emfforms.core.bazaar.feature"
       label="Bazaar Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.core.bazaar"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml b/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
index 2f4793486d..bc150574e3 100644
--- a/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
+++ b/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.bazaar.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.datatemplate.feature/feature.xml b/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
index 74f83a9377..712f7419a8 100644
--- a/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
+++ b/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.datatemplate.feature"
       label="EMF Forms Data Templates"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.datatemplate.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.datatemplate.feature/pom.xml b/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
index a9856cb553..585223f9ac 100644
--- a/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
+++ b/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml b/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
index 8860ce56d4..ad803cdd66 100644
--- a/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
+++ b/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.datatemplate.ide.feature"
       label="EMF Forms Datatemplate Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.datatemplate.tooling"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml b/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
index bc45b0416b..c51997f50b 100644
--- a/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
+++ b/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.ide.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.editor.feature/feature.xml b/features/org.eclipse.emfforms.editor.feature/feature.xml
index 0df34437c0..96cf938e48 100644
--- a/features/org.eclipse.emfforms.editor.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.editor.feature"
       label="EMF Forms Ecore Editor"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.editor"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.editor.feature/pom.xml b/features/org.eclipse.emfforms.editor.feature/pom.xml
index 923c3d2ba2..82e243f1c3 100644
--- a/features/org.eclipse.emfforms.editor.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
index 0792434166..fb13d0f35f 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.editor.genmodel.util.feature"
       label="EMF Forms GenModel Editor Util"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.editor.genmodel.util"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
index 4edde08a63..97e7ebc4fd 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.genmodel.util.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.i18n.feature/feature.xml b/features/org.eclipse.emfforms.i18n.feature/feature.xml
index 70205718d2..a63578c62e 100644
--- a/features/org.eclipse.emfforms.i18n.feature/feature.xml
+++ b/features/org.eclipse.emfforms.i18n.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emfforms.i18n.feature"
       label="EMFForms I18n Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
diff --git a/features/org.eclipse.emfforms.i18n.feature/pom.xml b/features/org.eclipse.emfforms.i18n.feature/pom.xml
index 307e899492..269ad60fe3 100644
--- a/features/org.eclipse.emfforms.i18n.feature/pom.xml
+++ b/features/org.eclipse.emfforms.i18n.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.i18n.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
index e6db806944..f46b82e660 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emfforms.rulerepository.feature"
       label="EMF Forms Rule Repository Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.rulerepository.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
index 768cc3a457..735ec99ca3 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.rulerepository.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
index ae2a2962e0..2e3e2c0c19 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.multiattribute.feature"
       label="EMF Forms SWT Control for Multi EAttribtues"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.swt.control.multiattribute"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
index 175984f2c3..e467449a4b 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.multiattribute.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
index bc7d208ab1..21cc906394 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.text.autocomplete.feature"
       label="EMF Forms SWT Text Control with Autocomplete Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.swt.control.text.autocomplete"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
index beb935bf45..26e18b50b3 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
index 1889a86333..428df9be53 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.text.richtext.feature"
       label="EMF Forms Rich Text Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.swt.control.text.richtext"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
index 5e3f97eee4..96dd5aa00e 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.text.richtext.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
index 266a714ad8..cf6eea3d57 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.controlgrid.feature"
       label="EMF Forms Control Grid SWT Feature (Experimental)"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.view.controlgrid.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
index 1c87b99cbf..a855fbd5d3 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.controlgrid.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
index c8b8193d52..c709851692 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.view.annotation.feature"
       label="EMF Forms Annotation View Model Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.view.annotation.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
index fda405182f..2dc8493ffe 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.view.annotation.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
index 4657a837db..43313eb873 100644
--- a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
+++ b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
@@ -7,7 +7,7 @@
       plugin="org.eclipse.emfforms.spreadsheet.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
index da784485f3..5a82bd7374 100644
--- a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.common.ui German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui.nl_de
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: OSGI-INF/l10n/bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.common.ui.nl_de
diff --git a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
index a77f171464..b3b850742a 100644
--- a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.common.ui.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
index cf0de7a1d6..ad051ec50d 100644
--- a/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.core German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
index 5640c30cda..02def215f7 100644
--- a/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
index c98f0c1424..ff52f38aeb 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.diffmerge.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
index c9fba83c41..9abecda801 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
index 6f46c77a58..233973944e 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.diffmerge.swt German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.swt.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
index 6a5e9d369b..9683a6589f 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.swt.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
index 007d6be85f..9fe944e2a0 100644
--- a/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
index 9540b95d55..6672ec7290 100644
--- a/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
index 264025dcc8..335ba10215 100644
--- a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.edit.swt German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
index 49e252102b..c58f2ea9da 100644
--- a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.swt.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
index 9039a16a8d..6e9b29bf06 100644
--- a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.ide.editor.view German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
index 9b888042e8..78332e82de 100644
--- a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.view.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
index 1daef40760..944aceab80 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.makeithappen.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
index 4f9fc59b97..2040fd5f10 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.makeithappen.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
index 5c9f0facc3..3b8efa797c 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.makeithappen.wizards German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.makeithappen.wizards;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.makeithappen.wizards;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
index ad7ec41351..ef6320a7d3 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.makeithappen.wizards.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
index 56fdc271d8..123fbad074 100644
--- a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.test.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.test.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.test.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
index 8638079227..03342c3f1b 100644
--- a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.test.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
index 240cca04bb..5c259c0ab8 100644
--- a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.ui.e3 German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.e3;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ui.e3;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
index 2a8768010e..badf93abcf 100644
--- a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.e3.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
index 30a94776ce..3c94dcbe5e 100644
--- a/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.ui German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
index 99301a9498..e4cd90e18b 100644
--- a/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
index 44d217cf0e..ae9de90a29 100644
--- a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.ui.validation German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
index 09a68c5294..e782c9d587 100644
--- a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.validation.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
index 43ae678a92..f71d259f2a 100644
--- a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.ui.view.editor.controls German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
index 187b6c8799..2b7d659e2a 100644
--- a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
index c9f33cc9e5..f124aa278f 100644
--- a/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.validation German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
index 66d1c1a924..85d23b64e3 100644
--- a/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
index 5d82467205..a5baa8c0b9 100644
--- a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.categorization.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
index ebc2ec99d6..29517fd6bc 100644
--- a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.categorization.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
index e3dffd1132..40a0d4341f 100644
--- a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.core.swt German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
index ace0f10979..2892be287b 100644
--- a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.core.swt.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
index 56c2aa10bb..2c33421adc 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.custom.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.custom.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.custom.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
index e456d6a516..f01b8c83ee 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.custom.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
index 7902588798..e29e053be7 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.custom.model German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
index 3f0ca6faed..f66962a017 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.custom.model.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
index 1f0d495104..e73d83e508 100644
--- a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.dynamictree.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
index 0f2321399c..3ae4ee189e 100644
--- a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
index 082b74601a..28e0a54b93 100644
--- a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.group.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.group.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
index 97dda72154..64f976c237 100644
--- a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.group.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
index ed4512cddc..41a7e5df05 100644
--- a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.groupedgrid.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.groupedgrid.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.groupedgrid.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
index ae6d1f5367..4b1da58c97 100644
--- a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
index ccd39bad75..bd4025cf6b 100644
--- a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.horizontal.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
index c746995b46..7802d6a815 100644
--- a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
index db38d1ebf6..ec13ecb596 100644
--- a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.label.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.label.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.label.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
index 27e7e435bb..367f8eb0fa 100644
--- a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.label.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
index 0bd6f4efa5..cacd519bc2 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
index ef39de4b3a..caa657bec4 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
index 434d8f699d..c2dad925f2 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.model.editor German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
index 57998781e2..92ce4181c4 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
index f21772a0b3..a0a7ad71af 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.model German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
index 642b999680..4100aab390 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
index f07326dbc0..0226df9fa9 100644
--- a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.rule.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
index 38ecbd5f6b..a2ab4dcdbb 100644
--- a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.rule.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
index e940d7663e..90c0d88008 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.table.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
index d8c45e413a..efaa8e6ed6 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
index ba44ad19d1..ff0411aebb 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.table.model German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
index 1d13a61ae7..e4bcfc2bd3 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.model.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
index 6f25240e5e..4ae93c2800 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Nebula Grid Table UI German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
index 8378f26b8b..a9b706e003 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
index 9a86977b09..28f2813063 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.view.spi.table.swt;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.swt;version="1.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.nl_de
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
index b1202a0bb0..4fa8be4188 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
index 3195bd4fac..b82cc182f0 100644
--- a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.template.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
index 168e876924..8d4c61e481 100644
--- a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.template.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
index 533d0b67d5..b615e43f06 100644
--- a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.treemasterdetail.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
index 11d83fe220..f5a6426530 100644
--- a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
index 22104e76bb..1e0006147f 100644
--- a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.view.vertical.model.edit German NLS Support
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.model.edit;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.model.edit;bundle-version="[1.25.0,1.25.1)"
diff --git a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
index 85e19af83b..3fe4f6f4ed 100644
--- a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-i18n-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.vertical.model.edit.nl_de</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
index 0aceefe792..00e463ee56 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.24.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.25.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.emf.ecp.application.e3/icons/eclipse_lg.gif"/>
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
index 6a91186415..8014bcd678 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.24.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.25.0.qualifier" useFeatures="false" includeLaunchers="true">
 
 
    <configIni use="default">
diff --git a/releng/org.eclipse.emf.ecp.products/pom.xml b/releng/org.eclipse.emf.ecp.products/pom.xml
index fde65c8a88..e24ed73835 100644
--- a/releng/org.eclipse.emf.ecp.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.products/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.products</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
   
   <build>
diff --git a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
index 518367859f..ad538d6a1f 100644
--- a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-rap-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<!-- Parent for the rap product. Needed to reduce environments.
diff --git a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
index b529a31fce..ce9e289d1f 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
+++ b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.24.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.25.0.qualifier" useFeatures="false" includeLaunchers="false">
 
    <aboutInfo>
       <image path="icons/eclipse_lg.gif"/>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/pom.xml b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
index 4a01fcbe00..05b33f3616 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-rap-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../org.eclipse.emf.ecp.rap.parent/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.products</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <properties>
diff --git a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
index 261b33662d..8ec4d2dac1 100644
--- a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-bundles-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
index c2add7cc1c..062cb14ea9 100644
--- a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-examples-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.features/pom.xml b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
index 01bfba7b9e..16c511b8d6 100644
--- a/releng/org.eclipse.emf.ecp.releng.features/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-features-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml b/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
index 51fbbf9522..da7eb9ae4c 100644
--- a/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-i18n-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- modules -->
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index 1ecdca18c4..f3e5d4ded9 100644
--- a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-tests-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 5e0b6cc83d..637a315e19 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -5,14 +5,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-parent</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<tycho-version>1.2.0</tycho-version>
 		<tycho-extras-version>1.2.0</tycho-extras-version>
 		<javadoc-version>2.10.3</javadoc-version>
-		<ecp-version>1.24.0</ecp-version>
+		<ecp-version>1.25.0</ecp-version>
 		<javadoc-title>EMF Client Platform ${ecp-version} API</javadoc-title>
 		<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/releng/org.eclipse.emf.ecp.repository.target/pom.xml b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
index 49058c6d51..f887b46e89 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.site.target.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>
diff --git a/releng/org.eclipse.emf.ecp.repository/pom.xml b/releng/org.eclipse.emf.ecp.repository/pom.xml
index 2c08054137..17501145a9 100644
--- a/releng/org.eclipse.emf.ecp.repository/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.site.feature</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<build>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/pom.xml b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
index fe827e95fe..d6cd9e85dc 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
@@ -5,7 +5,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

diff --git a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
index 32b2c061c2..622ecbe6dd 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
@@ -5,7 +5,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
index 1023f81481..046dc16fce 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker EMFStore Provider Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.changebroker.provider.test
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
index 238698b61d..a88a0fd40c 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.provider.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
index ccc296964d..5c012a1223 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
index 69325cd584..336947dab9 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
index 31dbe10230..ba978c7520 100644
--- a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.24.0",
- org.eclipse.emf.ecp.common.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.25.0",
+ org.eclipse.emf.ecp.common.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport,
diff --git a/tests/org.eclipse.emf.ecp.common.test/pom.xml b/tests/org.eclipse.emf.ecp.common.test/pom.xml
index 8f6fd2f13d..ca89bb8bc3 100644
--- a/tests/org.eclipse.emf.ecp.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.common.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
index 4942aa70ec..47584eacf7 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Common UI Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
index b942974e3c..9e6ee23d1b 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.common.ui.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
index f2ee815213..59e9b9ff62 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.concurrent.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,1.10.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.ds
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.concurrent.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.internal.ui;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.internal.ui;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
index db660b4399..c43c369856 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.rap.concurrent.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
index 31d8c340ca..e4a140a8e7 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Rap Sessionprovider Concurrent Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
index 2161b74d2e..2fa8d3ed35 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
index fe31cdb9c5..fa3572b474 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Rap Sessionprovider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
index 2b17711164..541caa32cb 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
index b8188ebc17..aa0fc06f6c 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
index 4b6617e4eb..dc5ca27234 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.rap.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
index 06174ee2c6..2a300fb204 100644
--- a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="4.0.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index 48f463dd7d..ebf6a355e4 100644
--- a/tests/org.eclipse.emf.ecp.core.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
index 0136beb2c5..bda1c449a0 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Diff Merge Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.test
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
index ee1b445d60..52e17b1727 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.diffmerge.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
index d564299a8f..7948da7a5a 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECore GenModel Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor.test;version="1.2.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ecore.editor.test
 Import-Package: org.eclipse.ui.part;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
index 5bb66cbf61..e513dd045d 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
@@ -5,12 +5,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.test</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-test-plugin</packaging>

   

   <build>

diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
index 351be6167d..c61f7bda06 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.table;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.2,3.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
-Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
index e2556f7826..935b2dd525 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.edit.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
index f08421b166..61ec575627 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF To Web JSON Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.24.0",
- org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.25.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.json.test
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
index 7032599758..4af0c6634e 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emf2web.json.test</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
index 172532c8fb..10a5d9a8a8 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE Editor View Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ide.editor.view.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.editor.view.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view.test
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
index f16edf06a9..16c7713c76 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.editor.view.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index a6807f615d..d72912839f 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.util.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
@@ -14,11 +14,11 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,1.10.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ide.util.test
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
index 63f6bb5f87..c769e292ab 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.util.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
index da7934fde5..ff9107e054 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDEViewModelRegistry Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
index 08002c02b4..32a47234f6 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.view.service.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
index 3c87639943..0f227cdaf1 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.integrationtest
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
index 272b7b4b63..bc6245dfb0 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.integrationtest</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
index 3468640f7b..ec39250374 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Quick Fix Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
index d316b3835f..4b55b4a926 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.quickfix.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
index 1276ee2cea..36cfba334b 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.test.university.provider.UniversityEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.test.model.edit
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
index 7296c11052..2604bf5a9d 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
index 6d12bb92b3..1368039bee 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.test.model.feature"
       label="ECP Test Model Feature"
-      version="1.24.0.qualifier">
+      version="1.25.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
index 019863a85f..be4d4c8d03 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.test.model.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
index 65d365bf97..d369fe3ec8 100644
--- a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.24.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.24.0",
- org.eclipse.emf.ecp.test.university.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.25.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.25.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.test.model
diff --git a/tests/org.eclipse.emf.ecp.test.model/pom.xml b/tests/org.eclipse.emf.ecp.test.model/pom.xml
index 184667f445..5ca613dac1 100644
--- a/tests/org.eclipse.emf.ecp.test.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
index 60437ac06d..2011e70ab9 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.validation.test
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
index 4bec9bbd36..30dbc76da6 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.validation.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
index e49bb73ec7..b487b45df1 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Editor Controls - Tests for Blocking UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
index 3d72ac5ec5..556ee2dd6b 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
index 810e71dbf6..70651f54e1 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.24.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.controls;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.25.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.controls;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
index 15c14b1407..7dcbbe2158 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
index 90a285468a..b302127586 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP String Modifier with Line Wrapping Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.linewrapper.tests
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
index c1e1a5f274..13aee6fa57 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.linewrapper.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
index 58e863d7bf..e3fdbd3c21 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.24.0";uses:="org.hamcrest",
- org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.24.0",
- org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.24.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
- org.eclipse.emf.ecp.ui.view.swt;version="1.24.0";
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.25.0";uses:="org.hamcrest",
+ org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.25.0",
+ org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.25.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
+ org.eclipse.emf.ecp.ui.view.swt;version="1.25.0";
   uses:="org.eclipse.emf.ecore,
    org.osgi.framework,
    org.eclipse.swt.widgets,
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecp.ui.view.swt.reference",
- org.eclipse.emf.ecp.ui.view.swt.test;version="1.24.0";
+ org.eclipse.emf.ecp.ui.view.swt.test;version="1.25.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecp.ui.view.swt.reference,
    org.eclipse.emf.common.notify,
@@ -23,15 +23,15 @@ Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.24.0";x-inte
    org.eclipse.emf.edit.domain"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.test
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
index 3b1cbf3075..274950d423 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
index 6f1705f02a..41bd7b588c 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.test
-Bundle-Version: 1.24.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.ui;bundle-version="3.104.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.test
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
index 5af107a3af..9006a20ae8 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
index 25184cf171..1ea68809a6 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Diagnostician Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
index cff8d345a8..7219d8d11d 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.diagnostician.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
index 5711993d5c..5264692cf3 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.validation.test
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index 874b52c34c..db5e8fc455 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
index 3dc86a2fe1..9e507a724d 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Categorization Model's Edit Bundle
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
index 12f2b1546e..7f832145bd 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.categorization.model.edit.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
index 26383f0edd..d132528269 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Categorization Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.swt.test
-Import-Package: org.eclipse.emf.ecp.test.common;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.test.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)",
  org.eclipse.swt.layout;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
index dbe6c2cb6d..b02478fed2 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.categorization.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
index f401d62962..3a005b6dc2 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
 Import-Package: org.eclipse.swt.graphics;version="0.0.0",
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
index 1e835fbe32..1ca8892f06 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.compoundcontrol.swt.test</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
index 4522cfaee7..df34e88028 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Context Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.context.tests
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
index 8dbdff08a8..2e98526a00 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.context.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
index eb41dacd76..db68f0f902 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multi Reference Control Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
index 0a5f836b2e..56fb55c925 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.control.multireference.tests</artifactId>
@@ -67,5 +67,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
index ee1a57eea1..56d11daa0d 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.24.0",
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.25.0",
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
@@ -25,14 +25,14 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="1.0.0",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
index ac92b22600..16bdd6e23f 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.core.swt.tests</artifactId>
@@ -62,5 +62,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
index 2bcc72fc68..d5c6c73901 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Custom SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.custom.ui.swt.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
index 21a8a83552..216c3c1a8a 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.custom.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
index dd5ad481a9..191fced2cc 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.dynamictree.feature"
       label="Dynamic Tree Feature"
-      version="1.24.0.qualifier"
+      version="1.25.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.dynamictree.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.24.0.qualifier">
+      license-feature-version="1.25.0.qualifier">
 
    <description>
       %description
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
index cd5eb8e11c..f214c887cf 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
index c0e3479bd7..f591439e6e 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.provider.DynamicTreeEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.edit
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
index c85f2e1219..ff5ce7b568 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
index 576f23e683..d81166c4bc 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.test.Activator
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.24.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.25.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.core.databinding,
    org.eclipse.emf.ecp.view.context,
@@ -17,24 +17,24 @@ Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.24.0"
    org.eclipse.emf.ecp.internal.ui.view.builders"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.junit;bundle-version="4.11.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
index cb91270c6b..51dcb9dbbe 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
index 44a9d9d742..7c5b2529f7 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.24.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model
 Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
index c22e4e210f..e297938e81 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
index c226319407..e1656a353a 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree SWT UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui.swt;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui.swt
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.25.0,1.25.1)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
index e298ffe3c6..5d33ae18a5 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
@@ -7,11 +7,11 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
index 27438fdb44..7bf77fe006 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
index 735fb8ef84..2e051270fd 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
@@ -7,11 +7,11 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
index 65a4f96eae..6be4f783c0 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.edapt.test
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
index 9e468ca7b0..8336fa86ca 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
@@ -6,12 +6,12 @@
 <parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
   </parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
index 1cd09570e7..a61545285e 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.util.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.24.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.25.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
index d3849d22a4..876638b59b 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.util.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
index e61f0df2f3..ed1444df87 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Group SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.group.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
index 603bc85acb..ca6e2ae7e2 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.group.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
index f4d63f969e..d9e7fdc1f2 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Horizontal SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
index 7f9b917c3c..4452d00509 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.horizontal.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
index c3db104e54..2a01d9fb0b 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
index 445aba6d33..b75737cf2c 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.indexdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
index 30a4fa2ffc..1f39d2275a 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.24.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.24.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.25.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
index c750396ccf..0f2a5823ec 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.keyattributedmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
index c775cb7d02..087b3bbb24 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model.test
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
index ce930db498..c5a10d365f 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.mappingdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
index 0ec2c0b728..1070a97b70 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Template Tooling Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
index c1de47a0f8..c3b9360bf0 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.migrator.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
index 998f8d3da7..16b30ae42a 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Common Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.test
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
index 749b2833c7..355f1291fe 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
index 267b70a38e..9b1a6f2a5b 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.edit.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
index cacbe18ab7..de05cbf56a 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.edit.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
index 0f6ed5e33f..0e30ba5f4d 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.editor.test.feature"
       label="View Model Editor Test Feature"
-      version="1.24.0.qualifier">
+      version="1.25.0.qualifier">
 
    <description>
       Plugins for testing the View Model Editor with Q7. 
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
index eaf4d252d5..72d95edc09 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.test.feature</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
index a6fdc79134..2788de270c 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Editor Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
index 0a2a78c867..02e466cbd4 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.editor.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
index 56e464f0f3..b136814c86 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Editor Test Plugin for Q7
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.testplugin;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.testplugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
index 8450932894..d9262fd426 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.editor.testplugin</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
index 562758e383..b2f086e2d8 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.integrationtest
-Bundle-Version: 1.24.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.integrationtest
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
index 5ac455d3ae..8a91779375 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.integrationtest</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
index 9d112915e6..65b92b5074 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Preview Common Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.25.0,1.25.1)"
 Export-Package: org.eclipse.emf.ecp.view.model.preview.common.test;version="0.0.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.106.2,4.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
index 41951ab558..bf9c34a193 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.preview.common.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
index 279d0feefe..08223ad169 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
index 327a9aa40f..77595e67a9 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.provider.generator.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
index 1c1e5bc842..2f495dd088 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP XMI Provider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.junit;bundle-version="4.0.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.xmi.test
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
index 561f99c773..f0028da1d3 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.provider.xmi.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
index 04dbb2aa66..3494bf2bac 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.model.test
-Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
index 645a117e8d..9c4c60ff0d 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index c74049f1d7..65b21ccec4 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
@@ -2,36 +2,36 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
- org.eclipse.emf.ecp.view.spi.rule;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.test
-Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
index 4b7f8c6f7c..44dde05f06 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
index 1e3e60822e..b16dfebad5 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
index 17d885b247..1fb54d8130 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
index 39bc38a732..954b192e2b 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Section SWT Renderers
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.24.0"
+Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.section.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
index eee4c79782..457cd14976 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.section.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
index dbb2fd0c4b..e40ca4297e 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Stack Model SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
index 945a1e628a..028c49b558 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.stack.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
index f74bd3cb02..36255e64fc 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.24.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.25.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
index 3907f92d76..696860eab5 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.table.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
index 37affc4c53..b7dbe7c466 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Utils for Table Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.test.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.24.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)"
+Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.25.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.test.common
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
index fd082d2c1c..fecbd59582 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-tests-parent</artifactId>

-    <version>1.24.0-SNAPSHOT</version>

+    <version>1.25.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

   </parent>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.view.table.test.common</artifactId>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
index 8b4b35bd9c..9cd8f7b2da 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.24.0",
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.25.0",
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding.beans;bundle-version="1.3.0",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
index f6d71b6d92..e6a9dd841a 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index 7f483c6eb0..d479fd361c 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,56 +2,56 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Table SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.24.0",
- org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.24.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.25.0",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.25.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.registry;bundle-version="[3.5.400,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
index ae9a2850cd..12c89321b3 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
index d55080b392..42e5b4e0b3 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Validation Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.validation.test;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.validation.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.table.validation.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
index fe1c2988d1..5002fb21c8 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.table.validation.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
index 96613b66a8..c7615c0252 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Template Model Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model.test
-Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
index 209ec15219..d730a632e5 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.template.model.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
index 4d2e570e44..89d301f29c 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Template Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.24.0",
- org.eclipse.emf.ecp.view.template.service;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.service.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.25.0",
+ org.eclipse.emf.ecp.view.template.service;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.service.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service.test
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
index 3018d2b17a..fcb69be318 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 	<artifactId>org.eclipse.emf.ecp.view.template.service.test</artifactId>

 	<packaging>eclipse-test-plugin</packaging>

-	<version>1.24.0-SNAPSHOT</version>

+	<version>1.25.0-SNAPSHOT</version>

 	<groupId>org.eclipse.emf.ecp</groupId>

 	

 		<build>

diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
index 391275b189..f9aee66020 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.template.tooling.test
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
index 54c2020631..84f39189bc 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.template.tooling.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
index b29420e00a..d014c08bcc 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Helper Class for the SWT View Model Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common.swt
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.25.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common.swt
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
index 3075193f4e..854a603c2a 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
@@ -7,12 +7,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.24.0-SNAPSHOT</version>

+		<version>1.25.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.test.common.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.24.0-SNAPSHOT</version>

+  <version>1.25.0-SNAPSHOT</version>

 

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index 05e9b5fc1a..b951ce46ce 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common
 Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.common.report;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.reveal;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.common.report;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.reveal;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
index 45df53ca0e..90c944894c 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.test.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
index 40db26a583..67fc33f12e 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the TreeMasterDetail Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.24.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.25.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
index 93efd38158..b90a425e9e 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
index d05c7099bc..07b8061f62 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms TreeMasterDetail Validation Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.validation.test
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
index db1f2b4503..e963097627 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
index e6ff7e0ab1..68c05f5319 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor SWTBot Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.ui.editor.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.ui.editor.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.24.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
- org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.25.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
+ org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.1,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="3.102.0",
  org.eclipse.swtbot.junit4_x;bundle-version="2.1.1",
  org.eclipse.jface.databinding;bundle-version="1.6.200",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.ui.editor.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
index ffa24ab25b..152debfe28 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.ui.editor.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
index d4aec0457f..93f267ac17 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Unset Service Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.unset.test
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
index aec033b87c..4866305ccd 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.unset.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
index 06d88a7587..fe89a4cb15 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .,
  lib/commons-beanutils-1.9.2.jar,
  lib/commons-lang3-3.3.2.jar,
  lib/org.apache.bval.bundle-0.5.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: car;version="1.24.0";x-internal:=true,
- car.impl;version="1.24.0";x-internal:=true,
- car.util;version="1.24.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.24.0";x-internal:=true
+Export-Package: car;version="1.25.0";x-internal:=true,
+ car.impl;version="1.25.0";x-internal:=true,
+ car.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.bean.test
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
index 2dcad2af05..2ce8bccb68 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.bean.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
index f427d1ec33..ef052c5f09 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.24.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.24.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.24.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.24.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.25.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.25.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.25.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.25.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.test
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
index 6cd076bffc..add60ee1ff 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
index 5c044ba4a4..29190a2b76 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the VerticalSWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
index 4d2a0ebd5f..617d83d42b 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.vertical.ui.swt.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
index 3a35c7bafe..9bdc9a51de 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewProxy Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.24.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.25.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.tests
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
index 4ff19a6667..5322ba50d1 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.viewproxy.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
index c97b4280e8..484cdc0c3b 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui.rap.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.workspace.ui.rap.test
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.core;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
index a1efbea3e9..a5421ff24e 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.workspace.ui.rap.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
index 1d0d2ed992..046e70ac47 100644
--- a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Locale Tests
 Bundle-SymbolicName: org.eclipse.emfforms.common.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.common.sort;version="1.24.0",
- org.eclipse.emfforms.common.tests;version="1.24.0",
- org.eclipse.emfforms.spi.common.locale;version="1.24.0",
- org.eclipse.emfforms.spi.common.validation;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.common.sort;version="1.25.0",
+ org.eclipse.emfforms.common.tests;version="1.25.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.25.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.25.0"
 Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.12.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.common.tests
diff --git a/tests/org.eclipse.emfforms.common.tests/pom.xml b/tests/org.eclipse.emfforms.common.tests/pom.xml
index 8e32b8e8d0..29cd4a1b3c 100644
--- a/tests/org.eclipse.emfforms.common.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.common.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
index 3a0f2db04f..413baa13a1 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Common Validation Tests
 Bundle-SymbolicName: org.eclipse.emfforms.common.validation.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.common.validation.tests;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.common.validation.tests;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
index 880622d6bc..649a09d10e 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.common.validation.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
index 681cb9fe10..4c8baffff7 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bazaar Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.bazaar.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
@@ -12,5 +12,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.bazaar.tests
 Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
index f03ce8666c..28feeb52b4 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.bazaar.tests</artifactId>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
index 55d22f11c6..3af8a3d7e2 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Featurepath Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)"
 Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.featurepath.tests
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
index f05ed5112c..2fb981831d 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.featurepath.tests</artifactId>
@@ -42,6 +42,6 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
index 393dc9e38f..f1da0d090b 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
index 0411a192eb..0b6c90ac59 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.index.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
index 1bcdd0eb41..4bbb533a40 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Integration Test
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.integrationtest
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.integrationtest
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
index 2c2320637f..a0d8e0d109 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.integrationtest</artifactId>
@@ -52,5 +52,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
index 36af365e2a..a97ace8660 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
index eb5f692404..7dd9d3668e 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
index 73b8251052..a7c68dbbed 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping.tests
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
index bf6ba2db00..ccac9ecb8d 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.mapping.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
index 43321a5f58..985c2102d3 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.testmodel;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.24.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.25.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
index 767786475f..9d88a59fa9 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.testmodel</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
index 20902bfdb5..ba31519dae 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms DataTemplate Service Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.datatemplate.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.datatemplate;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.datatemplate;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
@@ -19,7 +19,7 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
index 0af957da6b..de20d1c4a7 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.datatemplate.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index 15ddd0c706..d16d49d912 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Domain Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.default.tests
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
index a81ac830c9..a9c87a45bc 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.default.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
index b8b1e55714..ef2973daf1 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
index c88590fe42..56627c010e 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.index.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
index 3bc59af2c2..0a68645eff 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
index 496bcf8ade..afe23a5d9a 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
index 11d0e2261e..60b47e6210 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
index 9e6d0ed1b4..2a1b9f1f2a 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
index 08f4bcd2f8..00451c512d 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Service EMF Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
index bee971b63d..06d201a21c 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.emf.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
index b4e37a0a16..c877683475 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Legacy Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.legacy.tests
-Import-Package: org.eclipse.emfforms.common;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emfforms.common;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
index 33f8d6a2fd..b62895c775 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.legacy.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
index 853c808546..dfcf617018 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Mapping Provider Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.panel.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
index 0c2b627ee2..8c886cacdd 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.mappingprovider.table.panel.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
index b1d08733b4..8d203eb382 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Mapping Provider Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
index 6b25a16335..cf32386a57 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.mappingprovider.table.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
index fb31bdf30c..2cdb34e2b1 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Featurepath Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.featurepath.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
index da578935b5..7ce4a047ca 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.featurepath.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
index 8f298ea456..fd89f6177c 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Core Services for Index Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.index.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.index;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.index;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
index 2f786903c9..280d1b4f5e 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.index.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
index fe8665c417..9f144be723 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.mapping.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.mapping.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
index b0f5934655..db311f575d 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.mapping.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
index df914c5f47..8072f06bf0 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Multi Segment Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.multi.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.multi;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.multi;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.multi.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
index c200fbf3bc..74c7a0e704 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.segments.multi.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
index f36a8f606c..aeb32a529c 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Services for DMR Segments Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
index 57da11a043..ca127e0dbc 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.segments.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
index 50b9bff590..2386a3973d 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Key Attribute Structural Change Tester Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index 3ed414ada1..9e44bb7dde 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
index 43f7e0a632..b71c4eeecd 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange;version="1.25.0";x-internal:=true
 Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.test
 Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
index 08adad2648..467698ea7b 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.structuralchange.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index 23b3998b56..bb5b1319b3 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.core.services.view;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.reveal;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.core.services.view;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.reveal;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.core.services.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)",
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
index 4153272276..93189a1c81 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
index c81876fc80..87733e9034 100644
--- a/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms DataTemplate Model Tests
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.datatemplate.model;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.datatemplate.tests;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.datatemplate.model;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.datatemplate.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
index 85b1547c3d..acee782cab 100644
--- a/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-tests-parent</artifactId>
-    <version>1.24.0-SNAPSHOT</version>
+    <version>1.25.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.datatemplate.model.tests</artifactId>
-  <version>1.24.0-SNAPSHOT</version>
+  <version>1.25.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
index c31bd613ce..d67796e392 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataTemplate Tests
 Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.tooling.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling.tests
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
index e7349809f4..c05e25a5d6 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.datatemplate.tooling.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
index f4b80bb7dd..f0a14405a3 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
@@ -2,62 +2,62 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Ecore Editor Test
 Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)"
 Export-Package: org.eclipse.emfforms.spi.editor;version="0.0.0"
 Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.setup.base;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.setup.base;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.editor.ecore.test
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.24.0,1.24.1)";resolution:=optional,
+ org.eclipse.emfforms.bazaar;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.25.0,1.25.1)";resolution:=optional,
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
index 5cd693eb7c..b1528f5fd2 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.editor.ecore.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
index 6961b9a1d5..75d26347df 100644
--- a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Editor Tests
 Bundle-SymbolicName: org.eclipse.emfforms.editor.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.spi.editor;version="1.24.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.spi.editor;version="1.25.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.editor.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emfforms.editor.test/pom.xml b/tests/org.eclipse.emfforms.editor.test/pom.xml
index 221bac72a3..efb0bba393 100644
--- a/tests/org.eclipse.emfforms.editor.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.editor.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
index 2e3b4ef1db..bb3642022b 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test plugin for EMFForms IDE Builder
 Bundle-SymbolicName: org.eclipse.emfforms.ide.builder.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.ide.builder;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.ide.builder.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.builder;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.ide.builder.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
  org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
  org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
  org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
index 1e81f239d6..afdc0c9ff0 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.builder.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
index 8599cc613c..4e98c2aef9 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Mapping Segment IDE Tooling Tests
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.mappingsegment.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.mappingsegment.test
 Import-Package: org.eclipse.swt;version="0.0.0",
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
index 5eaadf7160..daeaaef41e 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.mappingsegment.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
index a83e75900a..eac96b4b7e 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests (UI Thread)
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test.uithread
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test.nouiharness
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
index 0ec8bb2c5c..0d5e70fb3d 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.multisegment.test.uithread</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
index c7e7c9624b..0b5200b5ab 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
index d03e085622..33c4030ebb 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.multisegment.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
index e72f6892aa..dbc08126bd 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Segments IDE Tooling TESTS
 Bundle-SymbolicName: org.eclipse.emfforms.ide.view.segments.test;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.24.0,1.24.1)"
+Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.25.0,1.25.1)"
 Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments.test
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
index 88ab132f40..f5991fa585 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.ide.view.segments.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
index 4dc0352b66..66119a5919 100644
--- a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.localization.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.localization.tests/pom.xml b/tests/org.eclipse.emfforms.localization.tests/pom.xml
index 1fe4e83644..05376b6d76 100644
--- a/tests/org.eclipse.emfforms.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.localization.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
index 7e5a1b976d..cc335255f0 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Repository Tooling Test
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.rulerepository.tooling.test;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.rulerepository.tooling.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
index 6ca92cd677..0fb90d5dae 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.rulerepository.tooling.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<groupId>org.eclipse.emf.ecp</groupId>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
index 5010527453..aa797d0dea 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SDK Integration Test
 Bundle-SymbolicName: org.eclipse.emfforms.sdk.integration.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: EMFForms Cell Editor Tests
 Automatic-Module-Name: org.eclipse.emfforms.sdk.integration.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -10,4 +10,4 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.felix.scr;version="[1.3.0,2.0.0)",
  org.osgi.framework;version="[1.5.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.24.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.25.0";x-internal:=true
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
index 953495ad36..1f8f74008b 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.sdk.integration.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<groupId>org.eclipse.emf.ecp</groupId>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
index 114237e755..3d7d70a98b 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Common Test Helper
 Bundle-SymbolicName: org.eclipse.emfforms.swt.common.test
-Bundle-Version: 1.24.0.qualifier
-Export-Package: org.eclipse.emfforms.swt.common.test;version="1.24.0"
+Bundle-Version: 1.25.0.qualifier
+Export-Package: org.eclipse.emfforms.swt.common.test;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.common.test/pom.xml b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
index 29eba854b9..bfea5b7113 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emfforms.swt.common.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
index 361d32d935..4d2f188d27 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for EMFForms SWT Renderer for Multi EAttributes
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.hamcrest.library;bundle-version="1.3.0",
- org.eclipse.emfforms.localization;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emfforms.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.control.multiattribute.tests
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
index d5502024ff..621e87e94a 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.control.multiattribute.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
index 92752d2c1d..1731519291 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Text Control with Autocomplete Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.24.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.control.text.autocomplete.tests
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
index c9894a9ff4..4b503df5c9 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
index bc56aea5d2..67acd4655a 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Control Grid SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.controlgrid.test
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index 2efb16e96d..59c6c19fbb 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.controlgrid.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
index 6f66eb883f..b3e456ed3a 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Core DI Extension Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension.tests;singleton:=true
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.24.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.25.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
index ab20353932..89f271d12e 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.extension.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
index a629f82831..6402de8366 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core DI Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.tests
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.24.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.24.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services;bundle-version="[1.24.0,1.24.1)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.25.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.25.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.25.0,1.25.1)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/testControlSWTRendererServiceDI.xml
@@ -26,8 +26,8 @@ Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.e4.core.di;version="0.0.0",
  org.eclipse.e4.core.di.annotations;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.25.0,1.25.1)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="1.8.0"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
index 5cc8571da3..0d4fa19d0d 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index 9a69d24e60..1c5e04f238 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.ui;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.24.0",
- org.eclipse.emfforms.swt.core.tests;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.ui;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.25.0",
+ org.eclipse.emfforms.swt.core.tests;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.core.tests
 Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.label.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.spi.vertical.model;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.test.common.spi;version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.label.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.spi.vertical.model;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.25.0,1.25.1)",
  org.osgi.framework;version="[1.6.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index af8cd384ac..679177d1c2 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
index f41b22c5c4..8dc4c59754 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Reference Selection Composite Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.reference.table.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.24.0",
- org.eclipse.emfforms.swt.reference.table.test;version="1.24.0"
+Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.25.0",
+ org.eclipse.emfforms.swt.reference.table.test;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.swt;bundle-version="[3.107.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.reference.table.test
-Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
index da922e1112..21d258e0c8 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.reference.table.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
index 41ab69ab58..cd711785a3 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.table.test
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.24.0,1.24.1)"
-Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.24.0",
- org.eclipse.emfforms.spi.swt.table.action;version="1.24.0",
- org.eclipse.emfforms.swt.table.test;version="1.24.0";x-internal:=true
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.25.0,1.25.1)"
+Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.25.0",
+ org.eclipse.emfforms.spi.swt.table.action;version="1.25.0",
+ org.eclipse.emfforms.swt.table.test;version="1.25.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.table.test
diff --git a/tests/org.eclipse.emfforms.swt.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
index b00969b11a..50b6ecaa96 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.table.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
index 59163bfe7e..286a6dcb67 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TreeMasterDetail Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.test
-Bundle-Version: 1.24.0.qualifier
+Bundle-Version: 1.25.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.24.0"
+Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.swtbot.swt.finder;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.swtbot.junit4_x;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
  org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.25.0,1.25.1)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail.test
 Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
index 0d8b468014..de48992bde 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.treemasterdetail.test</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
index 1f3c424275..af0dd85f69 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization.tests
-Bundle-Version: 1.24.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.24.0,1.24.1)"
+Bundle-Version: 1.25.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.25.0,1.25.1)"
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.24.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.24.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.25.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.25.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.view.model.localization.tests
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.24.0,1.24.1)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.25.0,1.25.1)"
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
index 40ae335125..6c57ee75b3 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.24.0-SNAPSHOT</version>
+		<version>1.25.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.view.model.localization.tests</artifactId>
-	<version>1.24.0-SNAPSHOT</version>
+	<version>1.25.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
index 29815aea21..f85b08866d 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Vendor: Eclipse Modeling Project
 Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.table;bundle-version="[1.0.0,1.1.0)"
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.24.0,1.24.1)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.25.0,1.25.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.table.tests
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
index 417d717f90..7e6722c172 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Export-Package: org.eclipse.emfforms.internal.spreadsheet.core;version="1.0.0";x
  org.eclipse.emfforms.spreadsheet.core.tests;version="1.0.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
index 073c3aa2a1..687142c06e 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
@@ -8,17 +8,17 @@ Export-Package: org.eclipse.emfforms.spreadsheet.integrationtest;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.24.0,1.24.1)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.24.0,1.24.1)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.25.0,1.25.1)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.25.0,1.25.1)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.spreadsheet.core.renderer.categorization;bundle-version="[1.0.0,1.1.0)"
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.10.0)",
+ org.eclipse.emfforms.spreadsheet.core.renderer.categorization;bundle-version="[1.0.0,1.10.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.integrationtest
 Import-Package: org.eclipse.core.runtime;version="3.5.0",